diff options
| author | Chris Lumens <clumens@redhat.com> | 2013-02-13 11:44:10 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2013-02-13 11:44:10 -0500 |
| commit | c85dd380d82331e0dfd449988535bc135ed45f45 (patch) | |
| tree | 14b6f2fc768b7efedbd502295c7be55c588a1738 | |
| parent | ece25b8c1a8ec13767c22d303b77491870b3d68b (diff) | |
| download | anaconda-c85dd380d82331e0dfd449988535bc135ed45f45.tar.gz anaconda-c85dd380d82331e0dfd449988535bc135ed45f45.tar.xz anaconda-c85dd380d82331e0dfd449988535bc135ed45f45.zip | |
Restore older behavior regarding ks argument without a file name (#910550).
The docs and anaconda did not match up. This updates anaconda to work the same
as it used to do, now to update the docs to match.
| -rwxr-xr-x | dracut/fetch-kickstart-net.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dracut/fetch-kickstart-net.sh b/dracut/fetch-kickstart-net.sh index 274071dc5..927dcdc87 100755 --- a/dracut/fetch-kickstart-net.sh +++ b/dracut/fetch-kickstart-net.sh @@ -36,13 +36,14 @@ if [ "$kickstart" = "nfs:auto" ]; then fi done } < /tmp/net.$netif.lease - # filename is appended with '$IP_ADDR-kickstart' if ending in '/' - if [ "${filename%/}" != "$filename" ]; then - filename="${filename}${new_ip_address}-kickstart" - fi kickstart="nfs:$server:$filename" fi +# kickstart is appended with '$IP_ADDR-kickstart' if ending in '/' +if [ "${kickstart%/}" != "$kickstart" ]; then + kickstart="${kickstart}${new_ip_address}-kickstart" +fi + info "anaconda fetching kickstart from $kickstart" if fetch_url "$kickstart" /tmp/ks.cfg; then parse_kickstart /tmp/ks.cfg |