Author: sparky
Date: Mon Mar 20 10:54:31 2006
New Revision: 7248
Modified:
ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper
Log:
- 'select ifcfg by module name' support
Modified: ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper
==============================================================================
--- ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper (original)
+++ ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper Mon Mar 20 10:54:31 2006
@@ -74,28 +74,34 @@
debug_mesg creating config file for $INTERFACE
. /usr/lib/ppcrcd/functions
DRIVER=$(ethtool -i $INTERFACE | awk '/^driver/ { print $2 }')
- ETHS="$(cmdvar eth)"
- [ -z "$ETHS" ] && { cmdopt nonveth || ETHS="$(cmdvar eth)"; }
- CONF=$(echo "$ETHS" | grep "^$DRIVER:")
- if [ -n "$CONF" ]; then
- IP=$(echo $CONF | awk -F: '{print $2}')
-
- GATE=$(echo $CONF | awk -F: '{print $3}')
- if [ -n "$GATE" ]; then
- sed -e "s/^GATEWAY=.*$/GATEWAY=$GATE/" \
- -e "s/^GATEWAYDEV=.*$/GATEWAYDEV=$INTERFACE/" \
- -i /etc/sysconfig/network
- fi
- for DNSip in $(echo $CONF | awk -F: '{print $4}' \
- | tr "," " "); do
- echo nameserver $DNSip >> /etc/resolv.conf
- done
- else
- IP=dhcp
+
+ if [ -f /etc/sysconfig/interfaces/$DRIVER.ifcfg ]; then
+ echo "DEVICE=$INTERFACE" > $CFG
+ sed '/^DEVICE=/d'
/etc/sysconfig/interfaces/$DRIVER.ifcfg >> $CFG
+ else
+ ETHS="$(cmdvar eth)"
+ [ -z "$ETHS" ] && { cmdopt nonveth || ETHS="$(cmdvar
eth)"; }
+ CONF=$(echo "$ETHS" | grep "^$DRIVER:")
+ if [ -n "$CONF" ]; then
+ IP=$(echo $CONF | awk -F: '{print $2}')
+
+ GATE=$(echo $CONF | awk -F: '{print $3}')
+ if [ -n "$GATE" ]; then
+ sed -e "s/^GATEWAY=.*$/GATEWAY=$GATE/" \
+ -e
"s/^GATEWAYDEV=.*$/GATEWAYDEV=$INTERFACE/" \
+ -i /etc/sysconfig/network
+ fi
+ for DNSip in $(echo $CONF | awk -F: '{print $4}' \
+ | tr "," " "); do
+ echo nameserver $DNSip >> /etc/resolv.conf
+ done
+ else
+ IP=dhcp
+ fi
+ ONBOOT="yes"
+ cmdopt nonet && ONBOOT="no"
+ set_ifcfg "$INTERFACE" "$IP" "$ONBOOT"
fi
- ONBOOT="yes"
- cmdopt nonet && ONBOOT="no"
- set_ifcfg "$INTERFACE" "$IP" "$ONBOOT"
fi
if [ ! -f /var/lock/subsys/network ] || [ ! -r $CFG ]; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
