[PC-BSD Commits] r7134 - in pcbsd: current/pc-sysinstall/backend-query stable/pc-sysinstall/backend-query

[svn at pcbsd.org]

Author: kris
Date: 2010-07-06 09:24:36 -0700 (Tue, 06 Jul 2010)
New Revision: 7134

Modified:
   pcbsd/current/pc-sysinstall/backend-query/detect-laptop.sh
   pcbsd/current/pc-sysinstall/backend-query/detect-nics.sh
   pcbsd/stable/pc-sysinstall/backend-query/detect-laptop.sh
   pcbsd/stable/pc-sysinstall/backend-query/detect-nics.sh
Log:

Cleanup some of the detection scripts for pc-sysinstall, thanks Ed Maste!



Modified: pcbsd/current/pc-sysinstall/backend-query/detect-laptop.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend-query/detect-laptop.sh	2010-07-06 15:47:10 UTC (rev 7133)
+++ pcbsd/current/pc-sysinstall/backend-query/detect-laptop.sh	2010-07-06 16:24:36 UTC (rev 7134)
@@ -25,9 +25,8 @@
 #
 # $FreeBSD: src/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh,v 1.2 2010/06/27 16:46:11 imp Exp $
 
-dmesgLine=`dmesg | grep "acpi_acad0"`
-if test "${dmesgLine}" = ""; then
-  echo "laptop: NO"
-else
+if devinfo | grep 'acpi_acad0' >/dev/null 2>/dev/null; then
   echo "laptop: YES"
-fi 
+else
+  echo "laptop: NO"
+fi

Modified: pcbsd/current/pc-sysinstall/backend-query/detect-nics.sh
===================================================================
--- pcbsd/current/pc-sysinstall/backend-query/detect-nics.sh	2010-07-06 15:47:10 UTC (rev 7133)
+++ pcbsd/current/pc-sysinstall/backend-query/detect-nics.sh	2010-07-06 16:24:36 UTC (rev 7134)
@@ -25,17 +25,12 @@
 #
 # $FreeBSD: src/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh,v 1.2 2010/06/27 16:46:11 imp Exp $
 
-rm /tmp/netCards 2>/dev/null
-touch /tmp/netCards
-
-config="`ifconfig -l`"
-
-for i in $config
-do
- 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 | head -1`>"
-   echo "${i}: $IDENT"
- fi
+for i in $(ifconfig -l); do
+  case "${i%%[0-9]*}" in
+  lo|fwe|fwip|plip|pfsync|pflog|tun)
+    continue
+    ;;
+  esac
+  IDENT=$(dmesg | sed -n "s/^$i: <\(.*\)>.*$/\1/p" | head -1)
+  echo "${i}: <$IDENT>"
 done

Modified: pcbsd/stable/pc-sysinstall/backend-query/detect-laptop.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend-query/detect-laptop.sh	2010-07-06 15:47:10 UTC (rev 7133)
+++ pcbsd/stable/pc-sysinstall/backend-query/detect-laptop.sh	2010-07-06 16:24:36 UTC (rev 7134)
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-dmesgLine=`dmesg | grep "acpi_acad0"`
-if test "${dmesgLine}" = ""; then
-  echo "laptop: NO"
-else
+if devinfo | grep 'acpi_acad0' >/dev/null 2>/dev/null; then
   echo "laptop: YES"
+else
+  echo "laptop: NO"
 fi 

Modified: pcbsd/stable/pc-sysinstall/backend-query/detect-nics.sh
===================================================================
--- pcbsd/stable/pc-sysinstall/backend-query/detect-nics.sh	2010-07-06 15:47:10 UTC (rev 7133)
+++ pcbsd/stable/pc-sysinstall/backend-query/detect-nics.sh	2010-07-06 16:24:36 UTC (rev 7134)
@@ -1,16 +1,36 @@
 #!/bin/sh
+#-
+# Copyright (c) 2010 iXsystems, Inc.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD: src/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh,v 1.2 2010/06/27 16:46:11 imp Exp $
 
-rm /tmp/netCards 2>/dev/null
-touch /tmp/netCards
-
-config="`ifconfig -l`"
-
-for i in $config
-do
- 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 | head -1`>"
-   echo "${i}: $IDENT"
- fi
+for i in $(ifconfig -l); do
+  case "${i%%[0-9]*}" in
+  lo|fwe|fwip|plip|pfsync|pflog|tun)
+    continue
+    ;;
+  esac
+  IDENT=$(dmesg | sed -n "s/^$i: <\(.*\)>.*$/\1/p" | head -1)
+  echo "${i}: <$IDENT>"
 done