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

[svn at pcbsd.org]

Author: kris
Date: 2009-10-07 13:27:42 -0700 (Wed, 07 Oct 2009)
New Revision: 4606

Modified:
   pcbsd/trunk/pc-sysinstall/backend-query/detect-nics.sh
   pcbsd/trunk/pc-sysinstall/backend-query/disk-list.sh
Log:

Fixed bugs with disk-listing in the backend



Modified: pcbsd/trunk/pc-sysinstall/backend-query/detect-nics.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/detect-nics.sh	2009-10-07 20:00:35 UTC (rev 4605)
+++ pcbsd/trunk/pc-sysinstall/backend-query/detect-nics.sh	2009-10-07 20:27:42 UTC (rev 4606)
@@ -7,7 +7,7 @@
 
 for i in $config
 do
- echo "${i}" | grep -e "lo0" -e "^fwe" -e "^plip" -e "^pfsync" -e "^pflog" -e "^tun" >/dev/null 2>/dev/null
+ echo "${i}" | grep -e "lo0" -e "^fwe" -e "^fwip" -e "lo1" -e "^plip" -e "^pfsync" -e "^pflog" -e "^tun" >/dev/null 2>/dev/null
  if [ "$?" != "0" ]
  then
    IDENT="<`dmesg | grep ^${i} | grep -v "miibus" | grep '<' | cut -d '<' -f 2 | cut -d '>' -f 1`>"

Modified: pcbsd/trunk/pc-sysinstall/backend-query/disk-list.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend-query/disk-list.sh	2009-10-07 20:00:35 UTC (rev 4605)
+++ pcbsd/trunk/pc-sysinstall/backend-query/disk-list.sh	2009-10-07 20:27:42 UTC (rev 4606)
@@ -13,10 +13,10 @@
 done < ${TMPDIR}/devlist
 
 # Move our fixed list over to the valid list
-mv /tmp/devlist.new /tmp/devlist >/dev/null 2>/dev/null
+mv ${TMPDIR}/devlist.new ${TMPDIR}/devlist >/dev/null 2>/dev/null
 
 # Now loop through these devices, and list the disk drives
-for i in `egrep "^(ad|aacd|mlxd|mlyd|mfid|hptiop|amrd|idad|twed|da|ar|isp|ips|)[0-9]:" /tmp/devlist | sort | uniq`
+for i in `egrep "^(ad|aacd|mlxd|mlyd|mfid|hptiop|amrd|idad|twed|da|ar|isp|ips|)[0-9]:" ${TMPDIR}/devlist | sort | uniq`
 do
 
   # Get the raw device name, no :