svn commit: r217136 - in user/nwhitehorn/bsdinstall: . libexec
scripts
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Sat Jan 8 00:48:01 UTC 2011
Author: nwhitehorn
Date: Sat Jan 8 00:48:00 2011
New Revision: 217136
URL: http://svn.freebsd.org/changeset/base/217136
Log:
Change the way files destined for the new system's /etc are stored and
add a missed file.
Added:
user/nwhitehorn/bsdinstall/libexec/services (contents, props changed)
Modified:
user/nwhitehorn/bsdinstall/bsdinstall
user/nwhitehorn/bsdinstall/scripts/auto
user/nwhitehorn/bsdinstall/scripts/config
user/nwhitehorn/bsdinstall/scripts/hostname
user/nwhitehorn/bsdinstall/scripts/mount
user/nwhitehorn/bsdinstall/scripts/netconfig
user/nwhitehorn/bsdinstall/scripts/services
Modified: user/nwhitehorn/bsdinstall/bsdinstall
==============================================================================
--- user/nwhitehorn/bsdinstall/bsdinstall Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/bsdinstall Sat Jan 8 00:48:00 2011 (r217136)
@@ -2,7 +2,8 @@
DISTRIBUTIONS="kernel.tgz world.tgz distribution.tgz"; export DISTRIBUTIONS
BSDINSTALL_LOG="/tmp/bsdinstall_log"; export BSDINSTALL_LOG
-PATH_FSTAB="/tmp/fstab"; export PATH_FSTAB
+BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"; export BSDINSTALL_TMPETC
+PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"; export PATH_FSTAB
BSDINSTALL_DISTDIR="/var/dist"; export BSDINSTALL_DISTDIR
BSDINSTALL_CHROOT="/mnt"; export BSDINSTALL_CHROOT
Added: user/nwhitehorn/bsdinstall/libexec/services
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/nwhitehorn/bsdinstall/libexec/services Sat Jan 8 00:48:00 2011 (r217136)
@@ -0,0 +1 @@
+link ../scripts/services
\ No newline at end of file
Modified: user/nwhitehorn/bsdinstall/scripts/auto
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/auto Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/auto Sat Jan 8 00:48:00 2011 (r217136)
@@ -15,7 +15,8 @@ error() {
fi
}
-rm /tmp/rc.conf
+rm -rf $BSDINSTALL_TMPETC
+mkdir $BSDINSTALL_TMPETC
bsdinstall hostname || error
FETCH_DISTRIBUTIONS=""
Modified: user/nwhitehorn/bsdinstall/scripts/config
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/config Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/config Sat Jan 8 00:48:00 2011 (r217136)
@@ -1,5 +1,3 @@
#!/bin/sh
-cp $PATH_FSTAB $BSDINSTALL_CHROOT/etc/fstab
-cp /tmp/rc.conf $BSDINSTALL_CHROOT/etc/rc.conf
-cp /tmp/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
+cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
Modified: user/nwhitehorn/bsdinstall/scripts/hostname
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/hostname Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/hostname Sat Jan 8 00:48:00 2011 (r217136)
@@ -16,4 +16,4 @@ If you are running on a managed network,
if [ $? -eq $DIALOG_CANCEL ]; then exec $0; fi
exec 3>&-
-echo "hostname=\"$HOSTNAME\"" >> /tmp/rc.conf
+echo "hostname=\"$HOSTNAME\"" >> $BSDINSTALL_TMPETC/rc.conf
Modified: user/nwhitehorn/bsdinstall/scripts/mount
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/mount Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/mount Sat Jan 8 00:48:00 2011 (r217136)
@@ -1,5 +1,7 @@
#!/bin/sh
+TMP_FSTAB=/tmp/bsdinstall-tmp-fstab
+
cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
if ($2 ~ "^/.*") {
fsname = $2;
@@ -8,16 +10,20 @@ cat $PATH_FSTAB | awk -v BSDINSTALL_CHRO
printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
fsname, $3, $4, $5, $6);
}
-}' > $PATH_FSTAB.tmp
+}' > $TMP_FSTAB
-FILESYSTEMS=`cat $PATH_FSTAB.tmp | awk '/^[^#].*/ {if ($2 ~ "^/.*") printf("%s\n", $2);}' | sort -t /`
+FILESYSTEMS=`cat $TMP_FSTAB | awk '/^[^#].*/ {if ($2 ~ "^/.*") printf("%s\n", $2);}' | sort -t /`
for i in $FILESYSTEMS; do
mkdir $i 2>/dev/null
- MNTERROR=`mount -F $PATH_FSTAB.tmp $i 2>&1`
+ MNTERROR=`mount -F $TMP_FSTAB $i 2>&1`
if [ $? -ne 0 ]; then
cdialog --backtitle "FreeBSD Installer" --title "Error" \
--msgbox "Error mounting partition $i:\n$MNTERROR" 0 0
exit 1
fi
done
+
+# User might want a shell and require devfs, so mount it
+mkdir $BSDINSTALL_CHROOT/dev
+mount -t devfs devfs $BSDINSTALL_CHROOT/dev
Modified: user/nwhitehorn/bsdinstall/scripts/netconfig
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/netconfig Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/netconfig Sat Jan 8 00:48:00 2011 (r217136)
@@ -25,7 +25,7 @@ exec 3>&-
cdialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0
if [ $? -eq $DIALOG_OK ]; then
- echo ifconfig_$INTERFACE=\"DHCP\" >> /tmp/rc.conf
+ echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf
if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
cdialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0
@@ -58,10 +58,10 @@ echo $INTERFACE $IF_CONFIG |
awk '{
printf("ifconfig_%s=\"%s netmask %s\"\n", $1, $2, $3);
printf("defaultrouter=\"%s\"\n", $4);
- }' >> /tmp/rc.conf
+ }' >> $BSDINSTALL_TMPETC/rc.conf
if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
- . /tmp/rc.conf
+ . $BSDINSTALL_TMPETC/rc.conf
ifconfig $INTERFACE `eval echo \\\$ifconfig_$INTERFACE`
route delete default
route add default $defaultrouter
@@ -74,8 +74,5 @@ echo $IF_CONFIG |
printf("nameserver %s\n", $4);
if ($5 != "")
printf("search %s\n", $5);
- }' > /tmp/resolv.conf
+ }' > $BSDINSTALL_TMPETC/resolv.conf
-if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
- cp /tmp/resolv.conf /etc/resolv.conf
-fi
Modified: user/nwhitehorn/bsdinstall/scripts/services
==============================================================================
--- user/nwhitehorn/bsdinstall/scripts/services Sat Jan 8 00:44:17 2011 (r217135)
+++ user/nwhitehorn/bsdinstall/scripts/services Sat Jan 8 00:48:00 2011 (r217136)
@@ -12,6 +12,6 @@ DAEMONS=$(cdialog --backtitle "FreeBSD I
exec 3>&-
for daemon in $DAEMONS; do
- echo ${daemon}_enable=\"YES\" >> /tmp/rc.conf
+ echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf
done
More information about the svn-src-user
mailing list