[PC-BSD Commits] r15590 - pcbsd/current/mfsroot-overlay/etc

[svn at pcbsd.org]

Author: kris
Date: 2012-02-24 18:33:56 +0000 (Fri, 24 Feb 2012)
New Revision: 15590

Modified:
   pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
   pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
Log:

Make sure we have a copy of /boot/kernel and /boot/modules available during
the installation. The newer xorg stuff needs availablity to drm / i915 and 
others to function properly.



Modified: pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2012-02-24 17:44:58 UTC (rev 15589)
+++ pcbsd/current/mfsroot-overlay/etc/SetupInstall.sh	2012-02-24 18:33:56 UTC (rev 15590)
@@ -4,7 +4,7 @@
 # Setup the /uzip memory device
 echo "Mounting /uzip"
 MDSIZE="`/bin/du -m /cdmnt/uzip/usr.uzip | /bin/cut -f 1`"
-MDSIZE="`/bin/expr ${MDSIZE} + 7`"
+MDSIZE="`/bin/expr ${MDSIZE} + 110`"
 echo "Creating ${MDSIZE}MB ramdisk..."
 /sbin/mdmfs -S -s ${MDSIZE}M -O space md2 /uzip
 
@@ -16,6 +16,13 @@
 MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/usr.uzip`.uzip"
 /sbin/mount -r /dev/$MDDEVICE /usr
 
+echo "Copying kernel into memory... Please Wait..."
+/bin/cp -R /cdmnt/boot/kernel /uzip/
+/bin/cp -R /cdmnt/boot/modules /uzip/
+/bin/ln -fs /boot/kernel /uzip/kernel
+/bin/ln -fs /boot/modules /uzip/modules
+/bin/cp /cdmnt/boot/device.hints /boot/device.hints
+
 # Load the extra klds we need
 /etc/rc.d/kld start
 

Modified: pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2012-02-24 17:44:58 UTC (rev 15589)
+++ pcbsd/current/mfsroot-overlay/etc/SetupLive.sh	2012-02-24 18:33:56 UTC (rev 15590)
@@ -7,7 +7,7 @@
 
 # Lets check and see if we have enough RAM to copy the .uzip file
 MDSIZE="`/bin/du -m /cdmnt/PCBSD.ufs.uzip | /bin/cut -f 1`"
-MDSIZE="`/bin/expr ${MDSIZE} + 200`"
+MDSIZE="`/bin/expr ${MDSIZE} + 300`"
 MDCHECK="`/bin/expr ${MDSIZE} + 512`"
 if [ $MEM -lt $MDCHECK ]
 then
@@ -17,6 +17,9 @@
   echo "Mounting /usr"
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /cdmnt/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
+  # Make the kernel available
+  /bin/ln -s /boot/kernel /cdmnt/boot/kernel
+  /bin/ln -s /boot/modules /cdmnt/boot/modules
 
 else
   # We have enough space to copy the uzip file to memory and run from RAM, yay!
@@ -31,6 +34,13 @@
   MDDEVICE="`/sbin/mdconfig -a -t vnode -o readonly -f /uzip/PCBSD.ufs.uzip`.uzip"
   /sbin/mount -r /dev/$MDDEVICE /mntuzip
 
+  echo "Copying kernel into memory... Please Wait..."
+  /bin/cp -R /cdmnt/boot/kernel /uzip/
+  /bin/cp -R /cdmnt/boot/modules /uzip/
+  /bin/ln -fs /boot/kernel /uzip/kernel 
+  /bin/ln -fs /boot/modules /uzip/modules 
+  /bin/cp /cdmnt/boot/device.hints /boot/device.hints
+
 fi
 
 /sbin/mdmfs -S -s 2M -O space md5 /usr