[PC-BSD Commits] r15805 - in pcbsd/current/src-sh/pc-updatemanager: . scripts

[svn at pcbsd.org]

Author: kris
Date: 2012-03-13 20:55:15 +0000 (Tue, 13 Mar 2012)
New Revision: 15805

Modified:
   pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
   pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
Log:

Update pc-updatemanager to use new meta-pkg location



Modified: pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-03-13 20:51:57 UTC (rev 15804)
+++ pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-03-13 20:55:15 UTC (rev 15805)
@@ -504,9 +504,9 @@
 	mv ${STAGEDIR}/xtra-data/upgrade-merges.new ${STAGEDIR}/xtra-data/upgrade-merges
 
 	# Check if we have a master system file listing and save it
-	if [ -e "/usr/local/share/pcbsd/base-ports/system-file.list" ] 
+	if [ -e "/var/db/pc-metapkgmanager/pkgsets/pcbsd/system-file.list" ] 
 	then
-	  cp /usr/local/share/pcbsd/base-ports/system-file.list ${STAGEDIR}/xtra-data/system-file.list.old
+	  cp /var/db/pc-metapkgmanager/pkgsets/pcbsd/system-file.list ${STAGEDIR}/xtra-data/system-file.list.old
 	fi
 
         # Rename the stagedir

Modified: pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2012-03-13 20:51:57 UTC (rev 15804)
+++ pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2012-03-13 20:55:15 UTC (rev 15805)
@@ -43,7 +43,7 @@
 cd /
 
 # Remove the old meta-pkg data
-rm -rf /usr/local/share/pcbsd/base-ports
+rm -rf /var/db/pc-metapkgmanager/pkgsets/pcbsd
 
 # Exclude ./boot in extract will do after world is done
 echo "./boot" >> ${STAGEDIR}/xtra-data/upgrade-excludes