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

svn at pcbsd.org svn at pcbsd.org
Sat Dec 5 11:45:35 PST 2009


Author: kris
Date: 2009-12-05 11:45:35 -0800 (Sat, 05 Dec 2009)
New Revision: 5256

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

Cleanup some of our logging to make the installer ready for regular users



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2009-12-05 19:34:14 UTC (rev 5255)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2009-12-05 19:45:35 UTC (rev 5256)
@@ -12,7 +12,7 @@
     gmirror list | grep "Name: ${DISK}" >/dev/null 2>/dev/null
     if [ "$?" = "0" ]
     then
-      echo_log "gmirror remove $gprov $DISK"
+      echo_log "Stopping mirror $gprov $DISK"
       rc_nohalt "gmirror remove $gprov $DISK"
       rc_nohalt "dd if=/dev/zero of=/dev/${DISK} count=4096"
       rc_nohalt "fdisk -I /dev/${DISK}"
@@ -212,7 +212,7 @@
   fi
 
   #Erase any existing bootloader
-  echo_log "Wiping ${DISK} with dd"
+  echo_log "Cleaning up ${DISK}"
   rc_halt "dd if=/dev/zero of=/dev/${DISK} count=2048"
 
   sleep 2
@@ -295,7 +295,7 @@
   sleep 2
 
   # Clean up old partition
-  echo_log "Wiping $slice with dd"
+  echo_log "Cleaning up $slice"
   rc_halt "dd if=/dev/zero of=/dev/${slice} count=1024"
 
   sleep 1
@@ -376,7 +376,7 @@
   sleep 2
 
   # Clean up old partition
-  echo_log "Wiping $slice with dd"
+  echo_log "Cleaning up $slice"
   rc_halt "dd if=/dev/zero of=/dev/${slice} count=1024"
 
   sleep 1

Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-12-05 19:34:14 UTC (rev 5255)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-12-05 19:45:35 UTC (rev 5256)
@@ -36,11 +36,8 @@
          fi
          cd ${FSMNT}.uzip
 
-         rm ${FSMNT}/.read.log >/dev/null 2>/dev/null
-         rm ${FSMNT}/.extract.log >/dev/null 2>/dev/null
-
          # Copy over all the files now!
-         tar cvf - . 2>>${FSMNT}/.read.log | tar -xpv -C ${FSMNT} ${TAROPTS} -f - 2>&1 | tee -a ${FSMNT}/.extract.log
+         tar cvf - . 2>/dev/null | tar -xpv -C ${FSMNT} ${TAROPTS} -f - 2>&1
          if [ "$?" != "0" ]
          then
            exit_err "ERROR: Failed extracting the tar image"



More information about the Commits mailing list