[PC-BSD Commits] r1343 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-02-10 08:58:04 -0800 (Sun, 10 Feb 2008)
New Revision: 1343

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
Log:

Fixed install script to copy the 1.5 kernel properly



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-02-10 16:54:12 UTC (rev 1342)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.ExtractTar.sh	2008-02-10 16:58:04 UTC (rev 1343)
@@ -53,10 +53,7 @@
 mkdir /mnt/tmp >/dev/null 2>/dev/null
 
 
-# Install single proc kernel
-sysctl -a | grep "kern.smp.cpus: 1" >/dev/null 2>/dev/null
-if [ "${?}" = "0" ]
-then
+# Install kernel
 
 # Any post install stuff here
 #echo "Install boot files...";
@@ -66,39 +63,20 @@
 tar xvjpf /PCBSD/kernels/pcbsd-standard.tbz
 " >/mnt/tmp/RunOnSys.sh
 
-# Set the kernel for the system tool
-echo "#!/bin/sh
-/usr/local/bin/PBReg set /PC-BSD/Kernel FBSD-6.2-UP_PCBSD
-" > /mnt/tmp/chKernel.sh
-chmod 755 /mnt/tmp/chKernel.sh
-chroot /mnt /tmp/chKernel.sh
-rm /mnt/tmp/chKernel.sh
+chmod 755 /mnt/tmp/RunOnSys.sh
+chroot /mnt /tmp/RunOnSys.sh
 
-else
-# Install SMP Kernel
+rm /mnt/tmp/RunOnSys.sh
 
-  #echo "Install boot files...";
-  echo "#!/bin/sh
-cd /boot 
-rm -rf /boot/kernel
-tar xvjpf /PCBSD/kernels/pcbsd-SMP.tbz
-" >/mnt/tmp/RunOnSys.sh
-
 # Set the kernel for the system tool
 echo "#!/bin/sh
-/usr/local/bin/PBReg set /PC-BSD/Kernel FBSD-6.2-SMP_PCBSD
+/usr/local/bin/PBReg set /PC-BSD/Kernel FBSD6.3-PCBSD1.5
 " > /mnt/tmp/chKernel.sh
 chmod 755 /mnt/tmp/chKernel.sh
 chroot /mnt /tmp/chKernel.sh
 rm /mnt/tmp/chKernel.sh
 
-fi
 
-chmod 755 /mnt/tmp/RunOnSys.sh
-chroot /mnt /tmp/RunOnSys.sh
-
-rm /mnt/tmp/RunOnSys.sh
-
 # Copy over our redundant files from installCD to the HD
 /usr/local/pcbsd/scripts/PCBSD.CopyExtra.sh >/dev/null 2>/dev/null