diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-02 13:15:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-02 13:15:15 +0000 |
| commit | f869380d2dd0a3973345ce587c59ef7e06d92a0b (patch) | |
| tree | 81a9aef9a6e70a5e11790c1cc3ced56d5846957c /initramfs-init.in | |
| parent | db521dfcda13f3b27cf0b2475a6e0c13ee61c3fb (diff) | |
| download | mkinitfs-f869380d2dd0a3973345ce587c59ef7e06d92a0b.tar.bz2 mkinitfs-f869380d2dd0a3973345ce587c59ef7e06d92a0b.tar.xz | |
init: minor cleanup. improve error reporting
Diffstat (limited to 'initramfs-init.in')
| -rwxr-xr-x | initramfs-init.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/initramfs-init.in b/initramfs-init.in index 0626f6c..fa629d2 100755 --- a/initramfs-init.in +++ b/initramfs-init.in @@ -281,19 +281,21 @@ configure_ip() { local netmask="$4" local device="$6" local autoconf="$7" - [ "$client_ip" = "off" -o "$client_ip" = "none" ] && return - if [ "$client_ip" = "dhcp" ]; then - autoconf="dhcp" - client_ip= - fi + case "$client_ip" in + off|none|'') return;; + dhcp) autoconf="dhcp";; + esac [ -n "$device" ] || device=$(ip_choose_if) - [ -n "$device" ] || return + if [ -z "$device" ]; then + echo "ERROR: IP requested but no network device was found" + return 1 + fi if [ "$autoconf" = "dhcp" ]; then if [ ! -e /usr/share/udhcpc/default.script ]; then echo "ERROR: DHCP requested but not present in initrd" - return + return 1 fi # automatic configuration ebegin "Obtaining IP via DHCP ($device)..." |