socsvn commit: r271860 - in soc2014/kczekirda/pxe-fai-head: head/usr.sbin/bsdinstall head/usr.sbin/bsdinstall/scripts others

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Mon Aug  4 19:11:15 2014
New Revision: 271860
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271860

Log:
  first steps of bsdinstall tofile simulation

Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/bsdinstall
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/hostname
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/keymap
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/mirrorselect
  soc2014/kczekirda/pxe-fai-head/others/template.input

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/bsdinstall
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/bsdinstall	Mon Aug  4 18:52:26 2014	(r271859)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/bsdinstall	Mon Aug  4 19:11:15 2014	(r271860)
@@ -58,6 +58,18 @@
 done
 shift $(( $OPTIND - 1 ))
 
+# when option "tofile" - only simulation
+if [ "$1" = "tofile" ]; then
+    if [ $2 ]; then
+        export TOFILE="$2" 
+        shift; shift # need delete option and path
+        echo "# installer configuration file from bsdinstall" > "$TOFILE"
+    else
+        echo "missing path - tofile parameter"
+        exit
+    fi
+fi
+
 # What are we here to do?
 VERB="${1:-auto}"; shift
 

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/hostname
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/hostname	Mon Aug  4 18:52:26 2014	(r271859)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/hostname	Mon Aug  4 19:11:15 2014	(r271860)
@@ -42,7 +42,12 @@
 if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
 exec 3>&-
 
-echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname
+if [ -z "$TOFILE" ]; then
+    echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname 
+else
+    echo "HOSTNAME=\"$HOSTNAME\"" >> "$TOFILE"
+fi
+
 if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 	hostname -s "$HOSTNAME"
 fi

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/keymap
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/keymap	Mon Aug  4 18:52:26 2014	(r271859)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/keymap	Mon Aug  4 19:11:15 2014	(r271860)
@@ -222,12 +222,17 @@
 	n=$( eval f_dialog_menutag2index_with_help \
 		\"\$menu_choice\" $menu_list )
 
-	# Turn that number ithe name of the keymap struct
+	# Turn that number in the name of the keymap struct
 	k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" )
 
 	# Get actual keymap setting while we update $keymap and $KEYMAPFILE
 	keymap_$k get keym keymap
-	echo "keymap=\"$keymap\"" > "$KEYMAPFILE"
+    if [ -z "$TOFILE" ]; then
+	    echo "keymap=\"$keymap\"" > "$KEYMAPFILE"
+    else
+        echo "KEYMAP=\"$keymap\"" >> "$TOFILE"
+    fi
+
 done
 
 f_quietly f_keymap_kbdcontrol "$keymap"

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/mirrorselect
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/mirrorselect	Mon Aug  4 18:52:26 2014	(r271859)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/mirrorselect	Mon Aug  4 19:11:15 2014	(r271860)
@@ -170,6 +170,12 @@
 
 BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/${RELDIR}/`uname -m`/`uname -p`/${_UNAME_R}"
 
+if [ "$TOFILE" ]; then
+    echo "MIRROR=\"$MIRROR\"" >> "$TOFILE"
+    echo "RELDIR=\"$RELDIR\"" >> "$TOFILE"
+    echo "RELEASE=\"${_UNAME_R}\"" >> "$TOFILE"
+fi
+
 case $MIRROR_BUTTON in
 $DIALOG_CANCEL)
 	exit 1

Modified: soc2014/kczekirda/pxe-fai-head/others/template.input
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug  4 18:52:26 2014	(r271859)
+++ soc2014/kczekirda/pxe-fai-head/others/template.input	Mon Aug  4 19:11:15 2014	(r271860)
@@ -1,12 +1,13 @@
+KEYMAP="pl_PL.ISO8859-2"
+HOSTNAME="testscriptinstall"
+MIRROR="ftp://ftp.pl.freebsd.org/"
+RELDIR="snapshots"
+RELEASE="11.0-CURRENT"
+
 ZFSBOOT="YES"
 ZFSPRESSED="/root/zfspressed"
 #PARTITIONS="ada1 { auto freebsd-ufs /}"
 DISTRIBUTIONS="kernel.txz base.txz"
-MIRROR="ftp://ftp.pl.freebsd.org/"
-RELDIR="snapshots"
-RELEASE="11.0-CURRENT"
-KEYMAP="pl_PL.ISO8859-2"
-HOSTNAME="testscriptinstall"
 TIMEZONE="Europe/Warsaw"
 DAEMONS="sshd dumpdev"
 INTERFACE="em0"
@@ -30,4 +31,3 @@
 
 #!/bin/sh
 echo "Installation complete, running in host system"
-