netconf: psip0 is not a driver (Bug#500, reported by Roman Ignatov)

diff --git a/commands/netconf/netconf.sh b/commands/netconf/netconf.sh
index 70a03d1f2bd7c4a6c991122e21866245d7aaded4..98b22ff11fa118e552c8cc0043fca976ea3eb339 100644 (file)
--- 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 050a7f4a24cee1364459784f500543bb1f0590a3..665fcdf28fccc1263c5b2a352bd7a345ec2250f2 100644 (file)
--- 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