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

[svn at pcbsd.org]

Author: kris
Date: 2008-08-07 14:56:21 -0700 (Thu, 07 Aug 2008)
New Revision: 2558

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

Fixed a few bugs with swap being activated automatically



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-08-07 21:53:28 UTC (rev 2557)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.FindUpdateParts.sh	2008-08-07 21:56:21 UTC (rev 2558)
@@ -22,11 +22,6 @@
 
   if [ "${FOUNDMNT}" = "1" ]
   then
-    if [ -e "${i}b" ]
-    then
-      swapon ${i}b
-    fi
-
     touch /tmp/TempUMount
     for mprt in `ls -1 ${i}[d-h]`
     do

Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-08-07 21:53:28 UTC (rev 2557)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.NewFS.sh	2008-08-07 21:56:21 UTC (rev 2558)
@@ -13,13 +13,6 @@
   *) FS="UFS-J" ;;
 esac
 
-#echo "Activating swap space..."
-#dd if=/dev/zero of=/mnt/swap0 bs=1024k count=256 >/dev/null 2>/dev/null
-#chmod 0600 /mnt/swap0 >/dev/null 2>/dev/null
-#mdconfig -a -t vnode -f /mnt/swap0 -u 8 && swapon /dev/md8 
-
-swapon ${1}b
-
 if [ "${FS}" = "UFS-J" ]
 then
   gjournal load # Activate GJOURNAL