[PC-BSD Commits] r17345 - pcbsd/current/overlays/install-overlay/etc

svn at pcbsd.org svn at pcbsd.org
Wed Jun 20 09:56:04 PDT 2012


Author: kris
Date: 2012-06-20 16:56:04 +0000 (Wed, 20 Jun 2012)
New Revision: 17345

Modified:
   pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh
   pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
Log:

Use /etc dist-file and fix integrity check



Modified: pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh	2012-06-20 16:53:46 UTC (rev 17344)
+++ pcbsd/current/overlays/install-overlay/etc/IntegrityCheck.sh	2012-06-20 16:56:04 UTC (rev 17345)
@@ -1,10 +1,9 @@
 #!/bin/sh
 #
-# Copyright (c) 2008 PC-BSD Project
-# Authors: tim at pcbsd.org
+# Copyright (c) 2012 PC-BSD Project
+# Authors: tim at pcbsd.org, kris at pcbsd.org
 #
-# This script checks the md5 of the usr.uzip filesystem,
-# and optionally the PCBSD.tar.lzma installer archive.
+# This script checks the md5 of the usr.uzip filesystem
 
 echo -e "Checking integrity of uzip filesystem...\c"
 
@@ -17,34 +16,3 @@
 else
  echo "OK"
 fi
-
-
-# Check if we have an install image to check and prompt
-if [ -e "/fbsd-release.txz" -a -e "/PCBSD.ufs.uzip" ]
-then
-
-CHECKFILE="/PCBSD.ufs.uzip"
-CHECKFILE2="/fbsd-release.txz"
-
-echo -e "Check integrity of installer archive?\n This may take several minutes. [y]:\c"
-read -t15s response
-
-if [ "$response" != "n" ]
-then
- echo -e "\nChecking integrity of installer archive...\c"
- /sbin/md5 -q ${CHECKFILE}  | /bin/cmp -s ${CHECKFILE}.md5 -
- if [ "$?" != "0" ]
- then
-  echo "FAILED"
-  exit 1
- fi
- /sbin/md5 -q ${CHECKFILE2}  | /bin/cmp -s ${CHECKFILE2}.md5 -
- if [ "$?" != "0" ]
- then
-  echo "FAILED"
-  exit 1
- fi
- echo "OK"
-fi
-
-fi # End of PCBSD.tar.lzma check

Modified: pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-20 16:53:46 UTC (rev 17344)
+++ pcbsd/current/overlays/install-overlay/etc/pcbsd-rc.sh	2012-06-20 16:56:04 UTC (rev 17345)
@@ -52,10 +52,15 @@
   sh /etc/SetupInstall.sh
 fi
 
+# Extract the etc-dist.txz
+/sbin/mdmfs -S -s 8M -O space md10 /etc
+/usr/bin/tar xvf /uzip/etc-dist.txz -C /etc >/dev/null 2>/dev/null
+
+# Extract the var-dist.txz
+/sbin/mdmfs -S -s 8M -O space md9 /var
+/usr/bin/tar xvf /uzip/var-dist.txz -C /var >/dev/null 2>/dev/null
+
 # Extract the root-dist.txz
-/sbin/mdmfs -S -s 20M -O space md8 /root
+/sbin/mdmfs -S -s 15M -O space md8 /root
 /usr/bin/tar xvf /uzip/root-dist.txz -C /root >/dev/null 2>/dev/null
 
-# Extract the var-dist.txz
-/sbin/mdmfs -S -s 20M -O space md9 /var
-/usr/bin/tar xvf /uzip/var-dist.txz -C /var >/dev/null 2>/dev/null



More information about the Commits mailing list