From c85dd380d82331e0dfd449988535bc135ed45f45 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 13 Feb 2013 11:44:10 -0500 Subject: 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. --- dracut/fetch-kickstart-net.sh | 9 +++++---- 1 file 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 -- cgit