[PC-BSD Commits] r21446 - pcbsd/current/src-sh/pc-extractoverlay

svn at pcbsd.org svn at pcbsd.org
Mon Feb 11 08:13:32 PST 2013


Author: kris
Date: 2013-02-11 16:13:32 +0000 (Mon, 11 Feb 2013)
New Revision: 21446

Modified:
   pcbsd/current/src-sh/pc-extractoverlay/pc-extractoverlay
Log:

Fix doing the inital extraction of our system



Modified: pcbsd/current/src-sh/pc-extractoverlay/pc-extractoverlay
===================================================================
--- pcbsd/current/src-sh/pc-extractoverlay/pc-extractoverlay	2013-02-10 10:22:21 UTC (rev 21445)
+++ pcbsd/current/src-sh/pc-extractoverlay/pc-extractoverlay	2013-02-11 16:13:32 UTC (rev 21446)
@@ -7,13 +7,13 @@
         
   while read pLine
   do
+     if [ -z "${pLine}" ] ; then continue ; fi
      echo $pLine | grep -q "^#"
      if [ $? -eq 0 ] ; then continue ; fi
 
-     ls ${_chroot}/$pLine >/dev/null 2>/dev/null
-     if [ $? -eq 0 ] ; then
+     if [ -e "${pLine}" ] ; then
         echo "Pruning: $pLine"
-        rm ${_chroot}/${pLine}
+        rm ${pLine}
      fi
   done <${PRUNEFILE}
 }
@@ -21,15 +21,14 @@
 do_ports_overlay()
 {
 
-  distFile="/usr/local/share/pcbsd/distfiles/overlay.txz"
-  excludeFile="/usr/local/share/pcbsd/conf/dist-excludes"
+  distFile="/usr/local/share/pcbsd/distfiles/port-overlay.txz"
 
   # Cleanup any extra port cruft that doesn't place nice with PC-BSD
   do_prune
 
   echo -e "Extracting ports overlay data...\c"
   cd /
-  tar xvmf ${distFile} -X ${excludeFile} . 2>/dev/null
+  tar xvmf ${distFile} 2>/dev/null
   if [ $? -eq 0 ] ; then
     echo -e "DONE"
     exit 0
@@ -48,7 +47,7 @@
 
   echo -e "Extracting desktop overlay data...\c"
   cd /
-  tar xvmf ${distFile} ${excludeOpt} . 2>/dev/null
+  tar xvmf ${distFile} ${excludeOpt} 2>/dev/null
   if [ $? -eq 0 ] ; then
     echo -e "DONE"
   else
@@ -67,7 +66,7 @@
 
   echo -e "Extracting server overlay data...\c"
   cd /
-  tar xvmf ${distFile} ${excludeOpt} . 2>/dev/null
+  tar xvmf ${distFile} ${excludeOpt} 2>/dev/null
   if [ $? -eq 0 ] ; then
     echo -e "DONE"
   else



More information about the Commits mailing list