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

[svn at pcbsd.org]

Author: kris
Date: 2010-02-16 10:39:13 -0800 (Tue, 16 Feb 2010)
New Revision: 6261

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

Also merge changes with rc.conf



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2010-02-16 18:34:58 UTC (rev 6260)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-upgrade.sh	2010-02-16 18:39:13 UTC (rev 6261)
@@ -202,6 +202,11 @@
   merge_config "${FSMNT}/boot/loader.conf.preUpgrade" "${FSMNT}/boot/loader.conf.new" "${FSMNT}/boot/loader.conf"
   rm ${FSMNT}/boot/loader.conf.new
 
+  # Merge the rc.conf with old
+  cp ${FSMNT}/etc/rc.conf ${FSMNT}/etc/rc.conf.new
+  merge_config "${FSMNT}/etc/rc.conf.preUpgrade" "${FSMNT}/etc/rc.conf.new" "${FSMNT}/etc/rc.conf"
+  rm ${FSMNT}/etc/rc.conf.new
+
 };
 
 # Function which unmounts all the mounted file-systems