diff options
| author | Will Woods <wwoods@redhat.com> | 2012-03-05 14:35:06 -0500 |
|---|---|---|
| committer | Will Woods <wwoods@redhat.com> | 2012-03-16 12:36:58 -0400 |
| commit | fbd6173fd30f6b433cca0bd376e7a255bd1581da (patch) | |
| tree | 0ebb993d55d7050af17526cda22fe6075021f026 /dracut/kickstart-genrules.sh | |
| parent | 0cb33e9af9a75d939b8a27bb5042b01b35cb6a46 (diff) | |
| download | anaconda-fbd6173fd30f6b433cca0bd376e7a255bd1581da.tar.gz anaconda-fbd6173fd30f6b433cca0bd376e7a255bd1581da.tar.xz anaconda-fbd6173fd30f6b433cca0bd376e7a255bd1581da.zip | |
kickstart: only wait for kickstart if we're actually fetching it
Diffstat (limited to 'dracut/kickstart-genrules.sh')
| -rwxr-xr-x | dracut/kickstart-genrules.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dracut/kickstart-genrules.sh b/dracut/kickstart-genrules.sh index 5d1722844..d9aa57f44 100755 --- a/dracut/kickstart-genrules.sh +++ b/dracut/kickstart-genrules.sh @@ -17,6 +17,7 @@ case "${kickstart%%:*}" in # network module will bring the right interface(s) online, and then.. when_netdev_online \ "/sbin/fetch-kickstart-net \$env{INTERFACE} $kickstart" + wait_for_kickstart ;; cdrom|hd|bd) # cdrom:<dev>, hd:<dev>:<path>, bd:<dev>:<path> splitsep ":" "$kickstart" kstype ksdev kspath @@ -25,12 +26,10 @@ case "${kickstart%%:*}" in warn "inst.ks='$kickstart'" warn "can't get kickstart: biospart isn't supported yet" ksdev="" + else + when_diskdev_appears "$ksdev" \ + "/sbin/fetch-kickstart-disk \$env{DEVNAME} $kspath" + wait_for_kickstart fi - [ -n "$ksdev" ] && \ - when_diskdev_appears "$ksdev" \ - "/sbin/fetch-kickstart-disk \$env{DEVNAME} $kspath" ;; esac - -# Make sure we stay in the mainloop until kickstart is fetched -[ -n "$kickstart" ] && wait_for_kickstart |