[PC-BSD Commits] r7007 - in pcbsd: current/pc-sysinstall/backend stable/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2010-06-23 05:38:26 -0700 (Wed, 23 Jun 2010)
New Revision: 7007

Modified:
   pcbsd/current/pc-sysinstall/backend/functions-bsdlabel.sh
   pcbsd/current/pc-sysinstall/backend/startautoinstall.sh
   pcbsd/stable/pc-sysinstall/backend/functions-bsdlabel.sh
   pcbsd/stable/pc-sysinstall/backend/startautoinstall.sh
Log:

Fixed installation without a geli passphase, patch from Madtree:

https://trac.pcbsd.org/ticket/312



Modified: pcbsd/current/pc-sysinstall/backend/functions-bsdlabel.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend/functions-bsdlabel.sh	2010-06-23 09:03:36 UTC (rev 7006)
+++ pcbsd/current/pc-sysinstall/backend/functions-bsdlabel.sh	2010-06-23 12:38:26 UTC (rev 7007)
@@ -15,7 +15,7 @@
   fi
 
   VAL="" ; export VAL
-  return -1
+  return
 };
 
 # On check on the disk-label line if we have any extra vars for this device

Modified: pcbsd/current/pc-sysinstall/backend/startautoinstall.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend/startautoinstall.sh	2010-06-23 09:03:36 UTC (rev 7006)
+++ pcbsd/current/pc-sysinstall/backend/startautoinstall.sh	2010-06-23 12:38:26 UTC (rev 7007)
@@ -96,7 +96,7 @@
     then
       ${SHUTDOWN_CMD}
     else 
-      echo "SUCCESS: Installation finished! Press ENTER to rebooot." 
+      echo "SUCCESS: Installation finished! Press ENTER to reboot." 
       read tmp
       shutdown -r now
     fi

Modified: pcbsd/stable/pc-sysinstall/backend/functions-bsdlabel.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend/functions-bsdlabel.sh	2010-06-23 09:03:36 UTC (rev 7006)
+++ pcbsd/stable/pc-sysinstall/backend/functions-bsdlabel.sh	2010-06-23 12:38:26 UTC (rev 7007)
@@ -15,7 +15,7 @@
   fi
 
   VAL="" ; export VAL
-  return -1
+  return
 };
 
 # On check on the disk-label line if we have any extra vars for this device

Modified: pcbsd/stable/pc-sysinstall/backend/startautoinstall.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend/startautoinstall.sh	2010-06-23 09:03:36 UTC (rev 7006)
+++ pcbsd/stable/pc-sysinstall/backend/startautoinstall.sh	2010-06-23 12:38:26 UTC (rev 7007)
@@ -96,7 +96,7 @@
     then
       ${SHUTDOWN_CMD}
     else 
-      echo "SUCCESS: Installation finished! Press ENTER to rebooot." 
+      echo "SUCCESS: Installation finished! Press ENTER to reboot." 
       read tmp
       shutdown -r now
     fi