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

svn at pcbsd.org svn at pcbsd.org
Mon Aug 6 08:40:10 PDT 2007


Author: kris
Date: 2007-08-06 08:40:10 -0700 (Mon, 06 Aug 2007)
New Revision: 559

Added:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Fixed up scripts for installCD which improves sound detection and more



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh	2007-07-24 22:16:20 UTC (rev 558)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindDisk.sh	2007-08-06 15:40:10 UTC (rev 559)
@@ -1,9 +1,23 @@
 #!/bin/sh
 
+FOUND="0"
+
 for i in `egrep "^(ad|aacd|mlxd|mlyd|amrd|idad|twed|da|ar|ips|)[0-9]:" /var/run/dmesg.boot | cut -d':' -f1 | sort | uniq`
 do
-  LN="`dmesg | grep ^$i | grep MB`" >/dev/null
+  LN="`cat /var/run/dmesg.boot | grep ^$i | grep MB`" >/dev/null
   echo ${LN}
   fdisk /dev/${i} >/tmp/${i}
+  FOUND="1"
 done
 
+If we couldn't find anything in the dmesg file, look for devices instead
+if [ "${FOUND}" = "0" ]
+then
+  if [ -e "/dev/ad0" ]
+  then
+     echo "ad0: XXXXXXMB <Unprobed IDE Disk>"
+     fdisk /dev/ad0 >/tmp/ad0  
+  fi
+
+fi
+

Added: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-07-24 22:16:20 UTC (rev 558)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2007-08-06 15:40:10 UTC (rev 559)
@@ -70,10 +70,13 @@
 
 # Setup the proper boot-loader 
 echo 'linux_load="YES"
-hw.pci.allow_unsupported_io_range="1"
+vesa_load="YES"
+splash_pcx_load="YES"
+bitmap_load="YES"
+bitmap_name="/boot/loading-screen.pcx"
+hw.pci.allhw.pci.allow_unsupported_io_range="1"
 hw.ata.atapi_dma="1"
-autoboot_delay="7"
-cpufreq_load="YES"' >/mnt/boot/loader.conf
+autoboot_delay="7"' >/mnt/boot/loader.conf
 
 if [ -e "/tmp/mirrorDrive" ]
 then
@@ -100,6 +103,9 @@
 # Make sure root shell history is removed
 rm /mnt/root/.history 2>/dev/null
 
+# Run sound detection
+/usr/local/pcbsd/scripts/PCBSD.SoundDetect.sh
+
 #echo "Unmounting Disk...";
 # Get the disks to unmount
 UMNTDEVS="`cat /mnt/etc/fstab | grep ufs | cut -d ' ' -f 1`"



More information about the Commits mailing list