[PC-BSD Commits] r6215 - pcbsd/trunk/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-02-10 07:52:45 -0800 (Wed, 10 Feb 2010)
New Revision: 6215

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-unmount.sh
Log:

Don't disable swap at end of install, doesn't hurt anything to leave it on, and may help fix some out of memory
errors when it gets turned off



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-unmount.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-unmount.sh	2010-02-09 21:20:40 UTC (rev 6214)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-unmount.sh	2010-02-10 15:52:45 UTC (rev 6215)
@@ -46,10 +46,10 @@
        EXT=""
      fi
 
-     if [ "${PARTFS}" = "SWAP" ]
-     then
-       rc_nohalt "swapoff /dev/${PART}${EXT}"
-     fi
+     #if [ "${PARTFS}" = "SWAP" ]
+     #then
+     #  rc_nohalt "swapoff /dev/${PART}${EXT}"
+     #fi
 
      # Check if we've found "/", and unmount that last
      if [ "$PARTMNT" != "/" -a "${PARTMNT}" != "none" -a "${PARTFS}" != "ZFS" ]
@@ -124,15 +124,15 @@
        PARTMNT="`cat ${PARTDIR}/${PART} | cut -d ':' -f 2`"
        PARTENC="`cat ${PARTDIR}/${PART} | cut -d ':' -f 3`"
 
-       if [ "${PARTFS}" = "SWAP" ]
-       then
-         if [ "${PARTENC}" = "ON" ]
-         then
-           rc_nohalt "swapoff /dev/${PART}.eli"
-         else
-           rc_nohalt "swapoff /dev/${PART}"
-         fi
-       fi
+       #if [ "${PARTFS}" = "SWAP" ]
+       #then
+       #  if [ "${PARTENC}" = "ON" ]
+       #  then
+       #    rc_nohalt "swapoff /dev/${PART}.eli"
+       #  else
+       #    rc_nohalt "swapoff /dev/${PART}"
+       #  fi
+       #fi
 
        # Check if we've found "/" again, don't need to mount it twice
        if [ "$PARTMNT" != "/" -a "${PARTMNT}" != "none" -a "${PARTFS}" != "ZFS" ]