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

[svn at pcbsd.org]

Author: kris
Date: 2009-12-28 13:10:44 -0800 (Mon, 28 Dec 2009)
New Revision: 5700

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

Small fix, correct using .eli at the end of labels when doing disk encryption



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2009-12-28 18:23:28 UTC (rev 5699)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-cleanup.sh	2009-12-28 21:10:44 UTC (rev 5700)
@@ -89,18 +89,17 @@
       then
         EXT=".eli"
       fi
-      if [ "${PARTFS}" = "UFS+J" ]
-      then
-        # Make sure geom_journal is loaded
-        setup_gjournal
-        EXT="${EXT}.journal"
-      fi
-
       # Figure out if we are using a glabel, or the mirror name for this entry
       if [ ! -z "${PARTLABEL}" ]
       then
-        DEVICE="label/${PARTLABEL}"
+        DEVICE="label/${PARTLABEL}${EXT}"
       else
+        if [ "${PARTFS}" = "UFS+J" ]
+        then
+          # Make sure geom_journal is loaded
+          setup_gjournal
+          EXT="${EXT}.journal"
+        fi
         DEVICE="${PART}${EXT}"
       fi