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

[svn at pcbsd.org]

Author: kris
Date: 2010-02-02 12:49:57 -0800 (Tue, 02 Feb 2010)
New Revision: 6161

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

Fixed a bug with using encrypted filesystems, in fstab we don't need the .eli extension when using glabel
for device names already



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2010-02-02 18:19:35 UTC (rev 6160)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2010-02-02 20:49:57 UTC (rev 6161)
@@ -102,21 +102,26 @@
     # Only create non-zfs partitions
     if [ "${PARTFS}" != "ZFS" ]
     then
-      if [ "${PARTENC}" = "ON" ]
-      then
-        EXT=".eli"
+
+      # Make sure geom_journal is loaded
+      if [ "${PARTFS}" = "UFS+J" ] ; then
+        setup_gjournal
       fi
-      # Figure out if we are using a glabel, or the mirror name for this entry
+
+      # Figure out if we are using a glabel, or the raw name for this entry
       if [ ! -z "${PARTLABEL}" ]
       then
-        DEVICE="label/${PARTLABEL}${EXT}"
+        DEVICE="label/${PARTLABEL}"
       else
-        if [ "${PARTFS}" = "UFS+J" ]
-        then
-          # Make sure geom_journal is loaded
-          setup_gjournal
+        # Check if using encryption 
+        if [ "${PARTENC}" = "ON" ] ; then
+          EXT=".eli"
+        fi
+
+        if [ "${PARTFS}" = "UFS+J" ] ; then
           EXT="${EXT}.journal"
         fi
+
         DEVICE="${PART}${EXT}"
       fi