[PC-BSD Commits] r17322 - in pcbsd/current/overlays/install-overlay: etc root

svn at pcbsd.org svn at pcbsd.org
Tue Jun 19 11:37:39 PDT 2012


Author: kris
Date: 2012-06-19 18:37:37 +0000 (Tue, 19 Jun 2012)
New Revision: 17322

Modified:
   pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
   pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
   pcbsd/current/overlays/install-overlay/root/PCBSDStartLive.sh
Log:

Fix how we load /root and /var



Modified: pcbsd/current/overlays/install-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-19 18:03:43 UTC (rev 17321)
+++ pcbsd/current/overlays/install-overlay/etc/SetupLive.sh	2012-06-19 18:37:37 UTC (rev 17322)
@@ -58,6 +58,3 @@
 
 # Set the marker that this is a LIVE bootup
 touch /usr/pcbsd-live
-
-# Create a /liveroot file system with some extra space
-/sbin/mdmfs -S -s 128M -O space md8 /liveroot

Modified: pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-19 18:03:43 UTC (rev 17321)
+++ pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-19 18:37:37 UTC (rev 17322)
@@ -17,23 +17,22 @@
 # Load geom_uzip
 kldload geom_uzip
 
+# Create a /tmp file system with some extra space
+/sbin/mdmfs -S -s 20M -O space md6 /tmp
+
+# Create zfs tmpdir
+mkdir /tmp/zfs
+
 # If we have a LIVE image, boot with it
 if [ -e "/PCBSD.ufs.uzip" ]
 then
-  # Create a /tmp file system with some extra space
-  /sbin/mdmfs -S -s 25M -O space md6 /tmp
-
   MEM=`sysctl hw.realmem | cut -d " " -f 2`
 
   # We are running in LIVE mode
   sh /etc/SetupLive.sh
-
 else
   # Installation medium ONLY
 
-  # Create a /tmp file system with some extra space
-  /sbin/mdmfs -S -s 15M -O space md6 /tmp
-
   # Run integrity checks
   /etc/IntegrityCheck.sh
   if [ "$?" != "0" ]
@@ -51,5 +50,12 @@
   
   # We are running a regular Install
   sh /etc/SetupInstall.sh
+fi
 
-fi
+# Extract the root-dist.txz
+/sbin/mdmfs -S -s 20M -O space md8 /root
+/usr/bin/tar xvf /root-dist.txz -C /root >/dev/null 2>/dev/null
+
+# Extract the var-dist.txz
+/sbin/mdmfs -S -s 20M -O space md9 /var
+/usr/bin/tar xvf /var-dist.txz -C /var >/dev/null 2>/dev/null

Modified: pcbsd/current/overlays/install-overlay/root/PCBSDStartLive.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/root/PCBSDStartLive.sh	2012-06-19 18:03:43 UTC (rev 17321)
+++ pcbsd/current/overlays/install-overlay/root/PCBSDStartLive.sh	2012-06-19 18:37:37 UTC (rev 17322)
@@ -6,26 +6,9 @@
 # Source our functions
 . /root/functions.sh
 
-# Move our /root directory to the ramdisk
-mv /root /liveroot/root
-ln -s /liveroot/root /root
-
 PATH="${PATH}:/usr/local/bin"
 export PATH
 
-# Now Copy over all our /etc files to make booting LIVE work
-cp /mntuzip/etc/auth.conf /etc/
-cp /mntuzip/etc/devfs* /etc/
-cp /mntuzip/etc/hosts.allow /etc/
-cp /mntuzip/etc/hosts.deniedssh /etc/
-cp /mntuzip/etc/ntp.conf /etc/
-cp /mntuzip/etc/pam.d/kde* /etc/pam.d/
-cp /mntuzip/etc/rc.d/sshd /etc/rc.d/
-cp /mntuzip/etc/rc.conf /etc/
-
-# Link over the kernel
-ln -s /mntuzip/boot/kernel /boot/kernel
-
 # Start some services
 /usr/local/etc/rc.d/pc-sounddetect start
 
@@ -64,7 +47,6 @@
 do
   if [ "$i" != "lo0" -a "$i" != "fxp0" -a "$i" != "pfsync0" -a "$i" != "pflog0" ]
   then
-    echo "ifconfig_${i}=\"DHCP\"" >>/etc/rc.conf
     (dhclient ${i} >/dev/null 2>/dev/null ) &
   fi
 done



More information about the Commits mailing list