diff options
| author | Will Woods <wwoods@redhat.com> | 2012-08-17 17:24:37 -0400 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2012-08-20 13:28:32 -0400 |
| commit | fd1c11158dfbe6c3c23dd1a390f65687c1544e4f (patch) | |
| tree | b8bca4fca515af92c767c8f39512fde8ba3fbe36 /dracut | |
| parent | 42a9093e263f7b226ee621ab930acfd00db5d6b4 (diff) | |
| download | anaconda-fd1c11158dfbe6c3c23dd1a390f65687c1544e4f.tar.gz anaconda-fd1c11158dfbe6c3c23dd1a390f65687c1544e4f.tar.xz anaconda-fd1c11158dfbe6c3c23dd1a390f65687c1544e4f.zip | |
dracut: fix old-style static ip=xxx gw=yyy...
If we parse "ip=... gw=..." and emit a new "ip=..." line, we end up with
multiple conflicting ip= args for that device. This makes dracut panic
with:
"Sorry, 'ip=$p' does not make sense for multiple interface
configurations"
Luckily dracut handles old-style anaconda ip=... arguments now, so we
can just drop this block of code and fix the problem. Yay!
Diffstat (limited to 'dracut')
| -rwxr-xr-x | dracut/parse-anaconda-net.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/dracut/parse-anaconda-net.sh b/dracut/parse-anaconda-net.sh index 4a69280fa..87dd77576 100755 --- a/dracut/parse-anaconda-net.sh +++ b/dracut/parse-anaconda-net.sh @@ -45,20 +45,6 @@ elif [ -n "$ipv6" ]; then # just ipv6 dhcp) check_depr_arg "ipv6=dhcp" "ip=${ksdevice:+$ksdevice:}dhcp6" ;; *) check_depr_arg "ipv6=" "ip=${ksdevice:+$ksdevice:}[%s]" ;; esac -elif [ -n "$ip" ]; then # just good ol' ipv4 - case "$ip" in - dhcp|*:*) ;; # these are acceptable for dracut - *.*.*.*) - nm="$(getarg netmask=)" || warn "ip=<ip> missing gateway=<gw>!" - gw="$(getarg gateway=)" || warn "ip=<ip> missing netmask=<nm>!" - if [ -n "$nm" ] && [ -n "$gw" ]; then - warn "'ip=<ip> gateway=<gw> netmask=<nm>' is deprecated." - warn "Use 'ip=<ip>::<gw>:<nm>[:<dev>]' instead." - strstr "$gw" ":" && gw="[$gw]" # put ipv6 addr in brackets - echo "ip=$ip::$gw:$nm${ksdevice:+:$ksdevice}" >> $net_conf - fi - ;; - esac fi [ -n "$ip$ipv6$ksdev_val" ] && set_neednet |