Browse Source

Minimize differences in ifstart() function between netstart and

install.sub which makes it easier to spot changes in the future.
- comments and formatting
- quotes on assignments are not needed (netstart)
- remove stray space in test (netstart)
- use $file variable with while-loop (netstart)
- although valid, instead of i use $i in arithmetic test (install.sub)
OK krw@, tb@
Looks good deraadt@
OPENBSD_6_2
rpe 7 years ago
parent
commit
e222a11a78
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      src/etc/netstart

+ 6
- 5
src/etc/netstart View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: netstart,v 1.174 2017/04/07 22:15:17 rpe Exp $
# $OpenBSD: netstart,v 1.175 2017/04/07 22:53:25 rpe Exp $
# Turn off Strict Bourne shell mode. # Turn off Strict Bourne shell mode.
set +o sh set +o sh
@ -51,7 +51,7 @@ ifstart() {
# We are carrying over from the 'read dt dtaddr' # We are carrying over from the 'read dt dtaddr'
# last time. # last time.
set -- $cmd2 set -- $cmd2
af="$1" name="$2" mask="$3" bcaddr="$4" ext1="$5" cmd2=
af=$1 name=$2 mask=$3 bcaddr=$4 ext1=$5 cmd2=
# Make sure and get any remaining args in ext2, # Make sure and get any remaining args in ext2,
# like the read below. # like the read below.
i=1 i=1
@ -64,7 +64,8 @@ ifstart() {
# $af can be "dhcp", "up", "rtsol", an address family, commands, # $af can be "dhcp", "up", "rtsol", an address family, commands,
# or a comment. # or a comment.
case "$af" in case "$af" in
"#"*|"") # Skip comments and empty lines.
"#"*|"")
# Skip comments and empty lines.
continue continue
;; ;;
"!"*) # Parse commands. "!"*) # Parse commands.
@ -84,7 +85,7 @@ ifstart() {
;; ;;
*) *)
read dt dtaddr read dt dtaddr
if [ "$name" = "alias" ]; then
if [ "$name" = "alias" ]; then
# Perform a 'shift' of sorts. # Perform a 'shift' of sorts.
alias=$name alias=$name
name=$mask name=$mask
@ -131,7 +132,7 @@ ifstart() {
;; ;;
esac esac
eval "$cmd" eval "$cmd"
done </etc/hostname.$if
done <$file
} }
# Start multiple interfaces by driver name. # Start multiple interfaces by driver name.


Loading…
Cancel
Save