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

[svn at pcbsd.org]

Author: kris
Date: 2010-02-02 08:50:02 -0800 (Tue, 02 Feb 2010)
New Revision: 6156

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh
   pcbsd/trunk/pc-sysinstall/conf/exclude-from-upgrade
Log:

Fixed few upgrade bugs from 7.x, added bit which creates some .preUpgrade files in case the user
wants to keep the pre-clobbered ones



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2010-02-02 16:03:27 UTC (rev 6155)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2010-02-02 16:50:02 UTC (rev 6156)
@@ -5,6 +5,9 @@
 mount_target_slice()
 {
   MPART="${1}"
+  
+  # Set a variable of files we want to make backups of before doing upgrade
+  BKFILES="/etc/rc.conf /boot/loader.conf"
 
   if [ -e "/dev/${MPART}a.journal" ]
   then
@@ -26,6 +29,12 @@
   echo_log "Cleaning up old filesystem... Please wait..."
   rc_halt "chflags -R noschg ${FSMNT}"
 
+  # Make backup copies of some files
+  for i in ${BKFILES}
+  do
+    cp ${FSMNT}${i} ${FSMNT}${i}.preUpgrade >/dev/null 2>/dev/null
+  done
+
   # If we are doing PC-BSD install, lets cleanup old pkgs on disk
   if [ "$INSTALLTYPE" != "FreeBSD" ]
   then

Modified: pcbsd/trunk/pc-sysinstall/conf/exclude-from-upgrade
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/exclude-from-upgrade	2010-02-02 16:03:27 UTC (rev 6155)
+++ pcbsd/trunk/pc-sysinstall/conf/exclude-from-upgrade	2010-02-02 16:50:02 UTC (rev 6156)
@@ -10,8 +10,6 @@
 etc/localtime
 etc/hosts
 etc/X11
-etc/rc.conf
 etc/nsmb.conf
 usr/Programs/.config/ProgList
 Programs/.config/ProgList
-boot/loader.conf