From: "Brian C. Lane" <bcl(a)redhat.com>
boot.iso is now built with the stage2 in images/install.img instead of
LiveOS/squashfs.img -- netboot needs to check for install.img first,
then fall back to squashfs.img if it isn't found.
This also adds a warning if neither can be retrieved, including the
interface it was using. We can't just enter the emergency shell when
this fails because other nics may become active and succeed in
retrieving it.
---
dracut/anaconda-netroot.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dracut/anaconda-netroot.sh b/dracut/anaconda-netroot.sh
index 0a9face..abc5eaa 100755
--- a/dracut/anaconda-netroot.sh
+++ b/dracut/anaconda-netroot.sh
@@ -56,15 +56,17 @@ case $repo in
stage2=$(config_get stage2 mainimage < $treeinfo)
if [ -z "$treeinfo" -o -z "$stage2" ]; then
warn "can't find installer mainimage path in .treeinfo"
- stage2="LiveOS/squashfs.img"
+ stage2="images/install.img"
fi
- if runtime=$(fetch_url $repo/$stage2); then
+ if runtime=$(fetch_url $repo/$stage2) || runtime=$(fetch_url
$repo/LiveOS/squashfs.img); then
# NOTE: Should be the same as anaconda_auto_updates()
updates=$(fetch_url $repo/images/updates.img)
[ -n "$updates" ] && unpack_updates_img $updates /updates
product=$(fetch_url $repo/images/product.img)
[ -n "$product" ] && unpack_updates_img $product /updates
/sbin/dmsquash-live-root $runtime
+ else
+ warn "Could not retrieve stage2 image from $repo using $netif"
fi
;;
*)
--
To view this commit on github, visit
https://github.com/rhinstaller/anaconda/commit/aa0e6ee127ba8c06b8e5596596...