From 9a37f63263ec1ed938fd4a6be626a1014f32f450 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Fri, 2 Jul 2010 11:22:42 +0000 Subject: [PATCH] netconf: psip0 is not a driver (Bug#500, reported by Roman Ignatov) --- commands/netconf/netconf.sh | 6 +++++- etc/usr/rc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/commands/netconf/netconf.sh b/commands/netconf/netconf.sh index 70a03d1f2..98b22ff11 100644 --- a/commands/netconf/netconf.sh +++ b/commands/netconf/netconf.sh @@ -319,7 +319,11 @@ test "$cd" != "yes" && test -f $INETCONF && mv $INETCONF "$INETCONF~" && test "$cd" != "yes" && test -f $LOCALRC && mv $LOCALRC "$LOCALRC~" && test "$v" = 1 && echo "Backed up $LOCALRC to $LOCALRC~" -echo "eth0 $driver 0 { default; } ;" > $INETCONF +if [ "$driver" = "psip0" ]; then + echo "psip0 { default; } ;" > $INETCONF +else + echo "eth0 $driver 0 { default; } ;" > $INETCONF +fi echo "$driverargs" > $LOCALRC if [ -n "$manual" ] diff --git a/etc/usr/rc b/etc/usr/rc index 050a7f4a2..665fcdf28 100644 --- a/etc/usr/rc +++ b/etc/usr/rc @@ -148,7 +148,7 @@ start) else # Standard network daemons. echo -n "Starting networking:" - if grep -s 'psip0.*default' /etc/inet.conf + if grep -s 'psip0.*default' /etc/inet.conf >/dev/null then ifconfig -h 10.0.0.1 else daemonize dhcpd -- 2.44.0