[PC-BSD Commits] r5208 - in pcbsd/trunk/pc-sysinstall: . backend-query

[svn at pcbsd.org]

Author: kris
Date: 2009-12-02 10:45:08 -0800 (Wed, 02 Dec 2009)
New Revision: 5208

Modified:
   pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh
   pcbsd/trunk/pc-sysinstall/pc-sysinstall
Log:

Updated pc-sysinstall, hide some errors from update part list query, and switch dir to /PCBSD/pc-sysinstall



Modified: pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh	2009-12-02 18:39:49 UTC (rev 5207)
+++ pcbsd/trunk/pc-sysinstall/backend-query/update-part-list.sh	2009-12-02 18:45:08 UTC (rev 5208)
@@ -4,7 +4,7 @@
 
 rm ${TMPDIR}/AvailUpgrades >/dev/null 2>/dev/null
 
-for i in `find -E /dev -regex '/dev/(ad|ar|aacd|mixd|mlyd|amrd|idad|twed|da)[0-9]+s[1-4]' -print`
+for i in `find -E /dev -regex '/dev/(ad|ar|aacd|mixd|mlyd|amrd|idad|twed|da)[0-9]+s[1-4]' -print 2>/dev/null`
 do
   # Set our flag that we have not found any mounts
   FOUNDMNT="0"
@@ -48,7 +48,7 @@
    LIST="d e f g h"
    for j in $LIST
    do
-     cat ${FSMNT}/etc/fstab | grep "${PART}${j}" >/dev/null 2>/dev/null
+     cat ${FSMNT}/etc/fstab 2>/dev/null | grep "${PART}${j}" >/dev/null 2>/dev/null
      if [ "$?" = "0" ]
      then
        MNT="`cat ${FSMNT}/etc/fstab | grep ${PART}${j} | cut -f 2 | cut -d " " -f 1`" >/dev/null 2>/dev/null
@@ -85,7 +85,7 @@
   pbreg get /PC-BSD/Version >/.pcver 2>/.pcver
 fi
 
-uname -r >/.fbver 2>/.fbver' >${FSMNT}/getver.sh
+uname -r >/.fbver 2>/.fbver' >${FSMNT}/getver.sh 
 
     chmod 755 ${FSMNT}/getver.sh >/dev/null 2>/dev/null
     chroot ${FSMNT} /getver.sh >${LOGOUT} 2>${LOGOUT}
@@ -95,7 +95,7 @@
     # Remove old files
     rm ${FSMNT}/.pcver >/dev/null 2>/dev/null
     rm ${FSMNT}/.fbver >/dev/null 2>/dev/null
-    rm ${FSMNT}/getver.sh
+    rm ${FSMNT}/getver.sh 2>/dev/null 
 
     # Echo our found partition / version
     if [ -z "${PCVER}" ]

Modified: pcbsd/trunk/pc-sysinstall/pc-sysinstall
===================================================================
--- pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-12-02 18:39:49 UTC (rev 5207)
+++ pcbsd/trunk/pc-sysinstall/pc-sysinstall	2009-12-02 18:45:08 UTC (rev 5208)
@@ -9,7 +9,7 @@
 # User-editable configuration variables
 
 # Set this to the program location
-PROGDIR="/pc-sysinstall"
+PROGDIR="/PCBSD/pc-sysinstall"
 export PROGDIR
 
 # Set this to the components location