[PC-BSD Commits] r4858 - in pcbsd/trunk/pc-sysinstall: . backend conf

[svn at pcbsd.org]

Author: kris
Date: 2009-11-03 12:52:18 -0800 (Tue, 03 Nov 2009)
New Revision: 4858

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
   pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
   pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg
   pcbsd/trunk/pc-sysinstall/pcinstall.cfg
Log:

Updated pc-sysinstall, restoring of a backup now works, from DVD uzip or tar file, essentially its
the same as a fresh install, except you can specifiy which install file to use, to pick something
other than the default "fresh" options



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-03 19:11:09 UTC (rev 4857)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-03 20:52:18 UTC (rev 4858)
@@ -54,15 +54,14 @@
 # Entrance function, which starts the installation process
 init_extraction()
 {
-  if [ "${INSTALLMODE}" = "restore" -o "${INSTALLMODE}" = "upgrade" ]
+  # Figure out what file we are using to install from via the config
+  get_value_from_cfg installFile
+
+  if [ -z "${VAL}" ]
   then
-    # Figure out what file we are using to install from via the config
-    get_value_from_cfg installFile
     INSFILE="${VAL}" ; export INSFILE
-
   else
-
-    # Lets figure out what file we are working on here and set it
+    # If no installFile specified, try our defaults
     if [ "$INSTALLTYPE" = "FreeBSD" ]
     then
       case $PACKAGETYPE in
@@ -78,7 +77,6 @@
       esac
     fi
     export INSFILE
-
   fi
 
   # Lets start by figuring out what medium we are using

Modified: pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-03 19:11:09 UTC (rev 4857)
+++ pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-03 20:52:18 UTC (rev 4858)
@@ -64,7 +64,7 @@
 PACKAGETYPE="${VAL}" ; export PACKAGETYPE
 
 # If we are not doing an upgrade, lets go ahead and setup the disk
-if [ "${INSTALLMODE}" = "fresh" -o "${INSTALLMODE}" = "restore" ]
+if [ "${INSTALLMODE}" = "fresh" ]
 then
   # Lets start setting up the disk slices now
   setup_disk_slice
@@ -85,20 +85,14 @@
   # Check if we have any optional modules to load 
   install_components
   
-  if [ "${INSTALLMODE}" != "restore" ]
-  then
-    # Now add any users
-    setup_users
-  fi
+  # Now add any users
+  setup_users
 
   # Now run any commands specified
   run_commands
   
-  if [ "${INSTALLMODE}" != "restore" ]
-  then
-    # Do any localization in configuration
-    run_localize
-  fi 
+  # Do any localization in configuration
+  run_localize
 
   # Do any last cleanup / setup before unmounting
   run_final_cleanup

Modified: pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-11-03 19:11:09 UTC (rev 4857)
+++ pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-11-03 20:52:18 UTC (rev 4858)
@@ -2,7 +2,6 @@
 
 installMode=fresh
 #installMode=upgrade
-#installMode=restore
 
 installInteractive=yes
 #installInteractive=no

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-03 19:11:09 UTC (rev 4857)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-03 20:52:18 UTC (rev 4858)
@@ -7,7 +7,7 @@
 # Set the disk parameters
 disk0=ad1
 partition=all
-bootManager=bsd
+bootManager=none
 commitDiskPart
 
 # Setup the disk label
@@ -24,11 +24,11 @@
 # Set if we are installing via optical, USB, or FTP
 installType=FreeBSD
 installMedium=dvd
+installFile=freebsd-release.tbz
 
 #packageType=lzma
 #packageType=uzip
 packageType=tar
-installFile=freebsd-release.tbz
 #installComponents=ports,src
 commitInstall