[PC-BSD Commits] r16230 - in pcbsd/current: mfsroot-overlay/etc src-qt4/warden/scripts/backend src-sh/pbi-manager src-sh/pc-thinclient src-sh/pc-updatemanager src-sh/pc-updatemanager/scripts system-overlay/usr/local/share/pcbsd/scripts

svn at pcbsd.org svn at pcbsd.org
Tue Apr 3 11:33:04 PDT 2012


Author: kris
Date: 2012-04-03 18:33:04 +0000 (Tue, 03 Apr 2012)
New Revision: 16230

Removed:
   pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts/portjail.sh
Modified:
   pcbsd/current/mfsroot-overlay/etc/IntegrityCheck.sh
   pcbsd/current/src-qt4/warden/scripts/backend/functions.sh
   pcbsd/current/src-sh/pbi-manager/pbi-manager
   pcbsd/current/src-sh/pc-thinclient/pc-thinclient
   pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
   pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
   pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2
Log:

Switch us to using .txz file extensions for install archives, while here get rid of 
old portjail.sh script, now functionality is in the warden



Modified: pcbsd/current/mfsroot-overlay/etc/IntegrityCheck.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/IntegrityCheck.sh	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/mfsroot-overlay/etc/IntegrityCheck.sh	2012-04-03 18:33:04 UTC (rev 16230)
@@ -20,11 +20,11 @@
 
 
 # Check if we have an install image to check and prompt
-if [ -e "/cdmnt/fbsd-release.tbz" -a -e "/cdmnt/PCBSD.ufs.uzip" ]
+if [ -e "/cdmnt/fbsd-release.txz" -a -e "/cdmnt/PCBSD.ufs.uzip" ]
 then
 
 CHECKFILE="/cdmnt/PCBSD.ufs.uzip"
-CHECKFILE2="/cdmnt/fbsd-release.tbz"
+CHECKFILE2="/cdmnt/fbsd-release.txz"
 
 echo -e "Check integrity of installer archive?\n This may take several minutes. [y]:\c"
 read -t15s response

Modified: pcbsd/current/src-qt4/warden/scripts/backend/functions.sh
===================================================================
--- pcbsd/current/src-qt4/warden/scripts/backend/functions.sh	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-qt4/warden/scripts/backend/functions.sh	2012-04-03 18:33:04 UTC (rev 16230)
@@ -113,7 +113,7 @@
 downloadchroot() {
 
   SYSVER="$(pbreg get /PC-BSD/Version)"
-  FBSD_TARBALL="fbsd-release.tbz"
+  FBSD_TARBALL="fbsd-release.txz"
   FBSD_TARBALL_CKSUM="${FBSD_TARBALL}.md5"
   ARCH=`uname -m`
 

Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2012-04-03 18:33:04 UTC (rev 16230)
@@ -1258,7 +1258,7 @@
 	if [ -z "${PBI_APPDIR}" ] ; then
 	  PBI_APPDIR="/usr/pbi"
         fi
-	PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world.tbz"
+	PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world.txz"
 	if [ `id -u` = "0" ] ; then 
 		PBI_HASHDIR="${PBI_APPDIR}/.hashdir"
 	else
@@ -6280,7 +6280,7 @@
 # No chroot environment tar file exists yet, lets build or extract
 mk_chroot_file() {
 
-	# Check if on PC-BSD and we can instead fetch fbsd-release.tbz
+	# Check if on PC-BSD and we can instead fetch fbsd-release.txz
 	if [ -e "$PCBSD_ETCCONF" ]; then
 
 	  cd "$PBI_APPDIR"
@@ -6296,12 +6296,12 @@
 
   	  # To fetch the jail environment
  	  echo "Fetching FreeBSD chroot environment... This may take a while..."
-  	  fetch -o rel.tbz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz
-    	  fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz.md5
+  	  fetch -o rel.txz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz
+    	  fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz.md5
 
-    	  [ `md5 -q rel.tbz` != `cat rel.md5` ] && exit_err "Error in download data, checksum mismatch.. Please try again later."
+    	  [ `md5 -q rel.txz` != `cat rel.md5` ] && exit_err "Error in download data, checksum mismatch.. Please try again later."
 
-	  mv rel.tbz ${PBI_CHROOTFILE}
+	  mv rel.txz ${PBI_CHROOTFILE}
 	  rm rel.md5
 	  return
  	fi

Modified: pcbsd/current/src-sh/pc-thinclient/pc-thinclient
===================================================================
--- pcbsd/current/src-sh/pc-thinclient/pc-thinclient	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-sh/pc-thinclient/pc-thinclient	2012-04-03 18:33:04 UTC (rev 16230)
@@ -232,18 +232,18 @@
 
   # To fetch the jail environment
   echo "Fetching FreeBSD environment... This may take a while..."
-  fetch -o rel.tbz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz
-  fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz.md5
-  if [ `md5 -q rel.tbz` != `cat rel.md5` ] ; then
+  fetch -o rel.txz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz
+  fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz.md5
+  if [ `md5 -q rel.txz` != `cat rel.md5` ] ; then
     echo "Error in download data, checksum mismatch.. Please try again later."
     exit 1
   fi
 
   echo "Extracting FreeBSD environment... This may take a while..."
-  tar xvpf rel.tbz 2>/dev/null
+  tar xvpf rel.txz 2>/dev/null
 
   # Cleanup
-  rm rel.tbz
+  rm rel.txz
   rm rel.md5
 }
 

Modified: pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-04-03 18:33:04 UTC (rev 16230)
@@ -470,7 +470,7 @@
 	else
           echo "MASTERFILECOUNT: 5"
 	fi
-	dList="PCBSD.tbz PCBSD.tbz.count PCBSD.tbz.md5 xtra-data.tbz xtra-data.tbz.md5"
+	dList="PCBSD.txz PCBSD.txz.count PCBSD.txz.md5 xtra-data.txz xtra-data.txz.md5"
 	for dFile in $dList
 	do
 
@@ -491,11 +491,11 @@
 	  fi
 	done
 
-	# Verify the md5 sums of .tbz files
-	mList="PCBSD.tbz xtra-data.tbz"
+	# Verify the md5 sums of .txz files
+	mList="PCBSD.txz xtra-data.txz"
 	for dFile in $mList
 	do
-	  echo "$dFile" | grep "\.tbz" >/dev/null 2>/dev/null
+	  echo "$dFile" | grep "\.txz" >/dev/null 2>/dev/null
 	  if [ $? -ne 0 ] ; then continue ; fi
 	  if [ "`md5 -q ${STAGEDIR}/$dFile`" != "`cat ${STAGEDIR}/${dFile}.md5`" ] ; then
 	    exit_err "File $dFile failed the checksum"
@@ -506,7 +506,7 @@
 	cd ${STAGEDIR}
 	mkdir xtra-data >/dev/null 2>/dev/null
 	cd xtra-data
-	tar xvjf "${STAGEDIR}/xtra-data.tbz" >/dev/null 2>/dev/null
+	tar xvjf "${STAGEDIR}/xtra-data.txz" >/dev/null 2>/dev/null
 	if [ $? -ne 0 ] ; then
 	  exit_err "Failed reading xtra-data for update"
 	fi
@@ -523,9 +523,9 @@
 	for dFile in $DLPKGLIST
 	do
 	  # See if we have the file already
-	  if [ -e "${STAGEDIR}/packages/${dFile}.tbz" -a -e "${STAGEDIR}/packages/${dFile}.tbz.md5" ] ; then
+	  if [ -e "${STAGEDIR}/packages/${dFile}.txz" -a -e "${STAGEDIR}/packages/${dFile}.txz.md5" ] ; then
 	    # File checksum is good, we can skip
-	    if [ "`md5 -q ${STAGEDIR}/packages/${dFile}.tbz`" = "`cat ${STAGEDIR}/packages/${dFile}.tbz.md5`" ] ; then
+	    if [ "`md5 -q ${STAGEDIR}/packages/${dFile}.txz`" = "`cat ${STAGEDIR}/packages/${dFile}.txz.md5`" ] ; then
   	      if [ ! -z "$PCFETCHGUI" ] ; then
 	        echo "FETCH: ${STAGEDIR}/packages/$dFile OK"
 	        echo "FETCH: ${STAGEDIR}/packages/${dFile}.md5 OK"
@@ -535,23 +535,23 @@
 	  fi
 
 	  # Download the file
-	  fetch_file "${MIRRORDIR}/packages/${dFile}.tbz" "${STAGEDIR}/packages/${dFile}.tbz" "1" "0"
+	  fetch_file "${MIRRORDIR}/packages/${dFile}.txz" "${STAGEDIR}/packages/${dFile}.txz" "1" "0"
 	  if [ $? -ne 0 ] ; then
-            echo "FAILED: ${dFile}.tbz" >${TRIGGERFILE}
-            exit_err "Failed to download: ${STAGEDIR}/packages/${dFile}.tbz"
+            echo "FAILED: ${dFile}.txz" >${TRIGGERFILE}
+            exit_err "Failed to download: ${STAGEDIR}/packages/${dFile}.txz"
 	  fi
 
 	  # Download the md5 file
-	  fetch_file "${MIRRORDIR}/packages/${dFile}.tbz.md5" "${STAGEDIR}/packages/${dFile}.tbz.md5" "1" "0"
+	  fetch_file "${MIRRORDIR}/packages/${dFile}.txz.md5" "${STAGEDIR}/packages/${dFile}.txz.md5" "1" "0"
 	  if [ $? -ne 0 ] ; then
-            echo "FAILED: ${dFile}.tbz.md5" >${TRIGGERFILE}
-            exit_err "Failed to download: ${STAGEDIR}/packages/${dFile}.tbz.md5"
+            echo "FAILED: ${dFile}.txz.md5" >${TRIGGERFILE}
+            exit_err "Failed to download: ${STAGEDIR}/packages/${dFile}.txz.md5"
 	  fi
 
 	  # Confirm the md5
-	  if [ "`md5 -q ${STAGEDIR}/packages/${dFile}.tbz`" !=  "`cat ${STAGEDIR}/packages/${dFile}.tbz.md5`" ] ; then
-            echo "FAILED: ${dFile}.tbz" >${TRIGGERFILE}
-            exit_err "Checksum failed for: ${STAGEDIR}/packages/${dFile}.tbz"
+	  if [ "`md5 -q ${STAGEDIR}/packages/${dFile}.txz`" !=  "`cat ${STAGEDIR}/packages/${dFile}.txz.md5`" ] ; then
+            echo "FAILED: ${dFile}.txz" >${TRIGGERFILE}
+            exit_err "Checksum failed for: ${STAGEDIR}/packages/${dFile}.txz"
 	  fi
 	done
 

Modified: pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage1	2012-04-03 18:33:04 UTC (rev 16230)
@@ -48,7 +48,7 @@
 # Exclude ./boot in extract will do after world is done
 echo "./boot" >> ${STAGEDIR}/xtra-data/upgrade-excludes
 
-tar xvpf ${STAGEDIR}/PCBSD.tbz -X ${STAGEDIR}/xtra-data/upgrade-excludes >/dev/null 2>/dev/null
+tar xvpf ${STAGEDIR}/PCBSD.txz -X ${STAGEDIR}/xtra-data/upgrade-excludes >/dev/null 2>/dev/null
 if [ $? -eq 0 ] ; then
   echo "DONE"
 else
@@ -65,7 +65,7 @@
 echo -e ".\c"
 
 mkdir /.boot-tmp
-tar xvpf ${STAGEDIR}/PCBSD.tbz -C /.boot-tmp ./boot >/dev/null 2>/dev/null
+tar xvpf ${STAGEDIR}/PCBSD.txz -C /.boot-tmp ./boot >/dev/null 2>/dev/null
 if [ $? -eq 0 ] ; then
   echo -e ".\c"
 else
@@ -119,7 +119,7 @@
 
   # Extract the new files into a tmpdir
   mkdir /tmp/merge-files.$$
-  tar xvpf ${STAGEDIR}/PCBSD.tbz -T ${STAGEDIR}/xtra-data/upgrade-merges -C /tmp/merge-files.$$ >/dev/null 2>/dev/null
+  tar xvpf ${STAGEDIR}/PCBSD.txz -T ${STAGEDIR}/xtra-data/upgrade-merges -C /tmp/merge-files.$$ >/dev/null 2>/dev/null
 
   while read mFile
   do

Modified: pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2	2012-04-03 18:22:36 UTC (rev 16229)
+++ pcbsd/current/src-sh/pc-updatemanager/scripts/mu-stage2	2012-04-03 18:33:04 UTC (rev 16230)
@@ -18,7 +18,7 @@
 # Install new pkgs
 echo "Installing system packages..."
 cd "${STAGEDIR}/packages"
-for i in `ls *.tbz`
+for i in `ls *.txz`
 do
   echo "$i" | grep -q -e "nvidia"
   if [ $? -eq 0 ] ; then continue ; fi
@@ -31,7 +31,7 @@
 done
 
 # Load any nvidia drivers last
-for i in `ls *nvidia*.tbz`
+for i in `ls *nvidia*.txz`
 do
   pkg_add -f "$i" >/dev/null 2>/dev/null
   printf "\r%-${length}s\r"



More information about the Commits mailing list