File sysconfig-avoid-pcmcia-prod_id-err-msg.bnc55164... of Package sysconfig

Overview Repositories Revisions Requests Users Attributes Meta

File sysconfig-avoid-pcmcia-prod_id-err-msg.bnc551640.diff of Package sysconfig

From 10dd95b0ec5ca0c64c65ac137a06b05511011598 Mon Sep 17 00:00:00 2001
From: mt <mt@bf393798-0adf-0310-9952-bd479070b6c1>
Date: Thu, 3 Dec 2009 17:19:29 +0000
Subject: [PATCH] Avoid error message, when pcmcia device does not provide its
 vendor/name info via sysfs device/prod_id files (bnc#551640).

---
 scripts/ifup |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/ifup b/scripts/ifup
index 4da733e..f6249ef 100755
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -503,9 +503,8 @@ DEVNAME=
 if [ -n "$VENDORID$PRODUCTID" -a "$BUSNAME" = pci -a -x /sbin/lspci ] ; then
 	DEVNAME=`lspci -d $VENDORID:$PRODUCTID 2>/dev/null | sed -n 1p`
 	DEVNAME=${DEVNAME#*: }
-fi
-if [ "$BUSNAME" = pcmcia ] ; then
-	DEVNAME=`cat /sys/class/net/$INTERFACE/device/prod_id*`
+elif [ "$BUSNAME" = pcmcia ] ; then
+	DEVNAME=`cat /sys/class/net/$INTERFACE/device/prod_id* 2>/dev/null`
 fi
 if [ -n "$DEVNAME" ] ; then
 	message "`printf "    %-9s device: %s" $INTERFACE "$DEVNAME"`"
-- 
1.6.4.2

Places

File sysconfig-avoid-pcmcia-prod_id-err-msg.bnc551640.diff of Package sysconfig

Places