Browse Source

only print the "IPv6 autoconf" line if there are interfaces to configure

feedback/ok rpe
OPENBSD_5_9
sthen 9 years ago
parent
commit
9bf3944524
1 changed files with 12 additions and 10 deletions
  1. +12
    -10
      src/etc/netstart

+ 12
- 10
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.154 2015/09/11 12:21:52 sthen Exp $
# $OpenBSD: netstart,v 1.155 2015/09/13 13:51:57 sthen Exp $
# Turn off Strict Bourne shell mode. # Turn off Strict Bourne shell mode.
set +o sh set +o sh
@ -154,16 +154,18 @@ ifmstart() {
# IPv6 autoconf the interfaces in the list at $rtsolif # IPv6 autoconf the interfaces in the list at $rtsolif
# Usage: ifautoconf # Usage: ifautoconf
ifautoconf() { ifautoconf() {
printf 'IPv6 autoconf:'
# $ip6kernel will not have been set if we were invoked with a
# list of interface names
if ifconfig lo0 inet6 >/dev/null 2>&1; then
for curif in $rtsolif; do
printf ' %s' $curif
ifconfig $curif inet6 autoconf
done
if [[ -n $rtsolif ]]; then
printf 'IPv6 autoconf:'
# $ip6kernel will not have been set if we were invoked with a
# list of interface names
if ifconfig lo0 inet6 >/dev/null 2>&1; then
for curif in $rtsolif; do
printf ' %s' $curif
ifconfig $curif inet6 autoconf
done
fi
echo
fi fi
echo
} }
# Get network related vars from rc.conf using the parsing routine from rc.subr. # Get network related vars from rc.conf using the parsing routine from rc.subr.


Loading…
Cancel
Save