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

[kczekirda at FreeBSD.org]

Author: kczekirda
Date: Thu Mar  5 09:43:02 2015
New Revision: 278255
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278255

Log:
  cleaning

Deleted:
  soc2014/kczekirda/pxe-fai-head/tools/mfsBSD-ipxe.iso
  soc2014/kczekirda/pxe-fai-head/tools/mfsBSD-ipxe.usb
  soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.0-RELEASE-fai-amd64.img
  soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-10.0-RELEASE-fai-amd64.iso
  soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-11.0-CURRENT-fai-amd64.img
  soc2014/kczekirda/pxe-fai-head/tools/mfsbsd-11.0-CURRENT-fai-amd64.iso
Modified:
  soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script

Modified: soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Thu Feb 26 21:49:50 2015	(r278254)
+++ soc2014/kczekirda/pxe-fai-head/head/usr.sbin/bsdinstall/scripts/script	Thu Mar  5 09:43:02 2015	(r278255)
@@ -2,6 +2,7 @@
 #-
 # Copyright (c) 2013 Nathan Whitehorn
 # Copyright (c) 2013 Devin Teske
+# Copyright (c) 2014 Kamil Czekirda
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -47,10 +48,10 @@
 # RELDIR default:
 : ${RELDIR:=releases}
 # RELEASE default:
-: ${RELEASE:=10.0-RELEASE}
+: ${RELEASE:=10.1-RELEASE}
 # HOSTNAME	to TMPETC if not exist, don't set
 # KEYMAP	to TMPETC if not exist, don't set
-# DAEMONS	to TMPETC if not exist, set only sshd
+# DAEMONS	to TMPETC if not exist, don't set
 # TIMEZONE	to /tmp/bsdinstall-installscript-ab
 # INTERFACE 	(em0, bge0)
 # IPV4 		(default: YES)
@@ -130,6 +131,20 @@
 	f_dprintf "Began Instalation at %s" "$( date )"
 fi
 
+############################################################ DEVICE PREPARING
+
+# Make partitions
+rm -f $PATH_FSTAB
+touch $PATH_FSTAB
+if [ "$ZFSBOOT" = "YES" ]; then
+	bsdinstall zfsboot /tmp/bsdinstall-installscript-aa 
+else
+	bsdinstall scriptedpart "$PARTITIONS"
+fi
+bsdinstall mount
+
+############################################################ INSTALLATION
+
 # Build mirror path
 
 MIRROR=$(echo "$MIRROR" | sed 's/\/$//')
@@ -137,6 +152,22 @@
 BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/$RELDIR/$UNAME_M/$UNAME_P/$RELEASE"
 export BSDINSTALL_DISTSITE
 
+# Fetch distributions
+
+BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
+export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
+echo "$BSDINSTALL_FETCHDEST"
+mkdir -p "$BSDINSTALL_FETCHDEST"
+
+export FTP_PASSIVE_MODE=YES
+bsdinstall distfetch
+
+# Unpack distributions
+bsdinstall checksum
+bsdinstall distextract
+
+############################################################ CONFIGURATION
+
 # Hostname
 if [ -n "$HOSTNAME" ]; then
 	echo "hostname=\"$HOSTNAME\"" > $BSDINSTALL_TMPETC/rc.conf.hostname
@@ -148,19 +179,15 @@
 fi
 
 # Services
-if [ -n "$DAEMONS" ]; then
-	havedump=
-	for daemon in $DAEMONS; do
-		[ "$daemon" = "dumpdev" ] && havedump=1 continue
-		echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
-	done
-	if [ "$havedump" ]; then
-		echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-	else
-		echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-	fi
+havedump=
+for daemon in $DAEMONS; do
+	[ "$daemon" = "dumpdev" ] && havedump=1 continue
+	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
+done
+if [ "$havedump" ]; then
+	echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 else
-	echo "sshd_enable=\"YES\"" > $BSDINSTALL_TMPETC/rc.conf.services
+	echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 fi
 
 # Time zone
@@ -195,18 +222,7 @@
 		echo "adduser -f $USERSCONFIG" >> /tmp/bsdinstall-installscript-ab
 fi
 
-# Make partitions
-rm -f $PATH_FSTAB
-touch $PATH_FSTAB
-if [ "$ZFSBOOT" = "YES" ]; then
-	bsdinstall zfsboot /tmp/bsdinstall-installscript-aa 
-else
-	bsdinstall scriptedpart "$PARTITIONS"
-fi
-bsdinstall mount
-
 # Network
-
 if [ -n "$INTERFACE" ] && [ "$IPV4" = "YES" ]; then
 	if [ "$DHCP" = "YES" ]; then
 		echo "ifconfig_${INTERFACE}=\"DHCP\"" >> $BSDINSTALL_TMPETC/rc.conf.network
@@ -230,8 +246,7 @@
 	fi
 fi
 
-# resolver
-
+# Resolver
 mkdir $BSDINSTALL_CHROOT/etc/
 if [ "$DOMAIN" ]; then
 	echo "domain $DOMAIN" >> $BSDINSTALL_CHROOT/etc/resolv.conf
@@ -253,29 +268,9 @@
 	echo "nameserver $DNS4" >> $BSDINSTALL_CHROOT/etc/resolv.conf
 fi
 
-
-# Fetch distributions
-
-BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
-export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
-echo "$BSDINSTALL_FETCHDEST"
-mkdir -p "$BSDINSTALL_FETCHDEST"
-
-export FTP_PASSIVE_MODE=YES
-bsdinstall distfetch
-
-# Unpack distributions
-bsdinstall checksum
-bsdinstall distextract
-
 # Finalize install
 bsdinstall config
 
-# Make sure networking is functional, if we can arrange that
-#if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
-#	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
-#fi
-
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript