[Midnightbsd-cvs] src [8944] trunk/usr.sbin/bsdinstall/scripts: fixes

[laffer1 at midnightbsd.org]

Revision: 8944
          http://svnweb.midnightbsd.org/src/?rev=8944
Author:   laffer1
Date:     2016-09-26 19:14:10 -0400 (Mon, 26 Sep 2016)
Log Message:
-----------
fixes

Modified Paths:
--------------
    trunk/usr.sbin/bsdinstall/scripts/auto
    trunk/usr.sbin/bsdinstall/scripts/services

Modified: trunk/usr.sbin/bsdinstall/scripts/auto
===================================================================
--- trunk/usr.sbin/bsdinstall/scripts/auto	2016-09-26 23:12:13 UTC (rev 8943)
+++ trunk/usr.sbin/bsdinstall/scripts/auto	2016-09-26 23:14:10 UTC (rev 8944)
@@ -53,15 +53,15 @@
 
 export DISTRIBUTIONS="base.txz kernel.txz"
 if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
-	DISTMENU=`cut -f 4,5,6 $BSDINSTALL_DISTDIR/MANIFEST | grep -v -e ^kernel -e ^base`
+	DISTMENU=`awk -F'\t' '!/^(kernel|base)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
 
 	exec 3>&1
-	EXTRA_DISTS=$(echo $DISTMENU | xargs dialog \
-	    --backtitle "MidnightBSD Installer" \
-	    --title "Distribution Select" --nocancel --separate-output \
-	    --checklist "Choose optional system components to install:" \
-	    0 0 0 \
-	2>&1 1>&3)
+	EXTRA_DISTS=$( eval dialog \
+	    --backtitle \"MidnightBSD Installer\" \
+	    --title \"Distribution Select\" --nocancel --separate-output \
+	    --checklist \"Choose optional system components to install:\" \
+	    0 0 0 $DISTMENU \
+	2>&1 1>&3 )
 	for dist in $EXTRA_DISTS; do
 		export DISTRIBUTIONS="$DISTRIBUTIONS $dist.txz"
 	done
@@ -211,6 +211,7 @@
     --yesno "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0
 if [ $? -eq 0 ]; then
 	clear
+	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
 	echo This shell is operating in a chroot in the new system. \
 	    When finished making configuration changes, type \"exit\".
 	chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1

Modified: trunk/usr.sbin/bsdinstall/scripts/services
===================================================================
--- trunk/usr.sbin/bsdinstall/scripts/services	2016-09-26 23:12:13 UTC (rev 8943)
+++ trunk/usr.sbin/bsdinstall/scripts/services	2016-09-26 23:14:10 UTC (rev 8944)
@@ -44,7 +44,7 @@
 	sshd	"Secure shell daemon" ${sshd_enable:-off} \
 	moused	"PS/2 mouse pointer on console" ${moused_enable:-off} \
 	ntpd	"Synchronize system and network time" ${ntpd_enable:-off} \
-	powerd	"Adjust CPU frequency dynamically" ${powerd_enable:-off} \
+	powerd	"Adjust CPU frequency dynamically if supported" ${powerd_enable:-off} \
 2>&1 1>&3)
 exec 3>&-