mirror of
https://github.com/xcat2/confluent.git
synced 2026-11-21 18:02:27 +00:00
Stop a diskless boot when the root filesystem cannot be extracted
extract_untethered_rootimg reports failure, for example when the image does not fit into the memory backed root, but imageboot.sh ignored it and booted into the partly extracted root, which then hung later on. Stop with a message saying why instead.
This commit is contained in:
@@ -65,7 +65,11 @@ if [ "untethered" = "$imagemethod" -o "uncompressed" = "$imagemethod" ]; then
|
||||
else
|
||||
mount -t tmpfs disklessroot /sysroot
|
||||
fi
|
||||
extract_untethered_rootimg
|
||||
if ! extract_untethered_rootimg; then
|
||||
# a partly extracted root would boot into a broken system
|
||||
echo "Unable to boot: the root filesystem could not be extracted into memory, the image may be too large for an untethered boot on this node"
|
||||
while :; do sleep 86400; done
|
||||
fi
|
||||
else
|
||||
TETHERED=1
|
||||
mount -o discard /dev/zram0 /mnt/overlay
|
||||
|
||||
@@ -64,7 +64,11 @@ if [ "untethered" = "$imagemethod" -o "uncompressed" = "$imagemethod" ]; then
|
||||
else
|
||||
mount -t tmpfs disklessroot /sysroot
|
||||
fi
|
||||
extract_untethered_rootimg
|
||||
if ! extract_untethered_rootimg; then
|
||||
# a partly extracted root would boot into a broken system
|
||||
echo "Unable to boot: the root filesystem could not be extracted into memory, the image may be too large for an untethered boot on this node"
|
||||
while :; do sleep 86400; done
|
||||
fi
|
||||
else
|
||||
TETHERED=1
|
||||
mount -o discard /dev/zram0 /mnt/overlay
|
||||
|
||||
@@ -98,7 +98,11 @@ elif [ "$imagemethod" = uncompressed ]; then
|
||||
mount -t tmpfs disklessroot /sysroot
|
||||
fi
|
||||
if [ "$TETHERED" = 0 ]; then
|
||||
extract_untethered_rootimg
|
||||
if ! extract_untethered_rootimg; then
|
||||
# a partly extracted root would boot into a broken system
|
||||
echo "Unable to boot: the root filesystem could not be extracted into memory, the image may be too large for an untethered boot on this node"
|
||||
while :; do sleep 86400; done
|
||||
fi
|
||||
elif [ ! -f /tmp/mountparts.sh ]; then
|
||||
mkdir -p /mnt/overlay/upper /mnt/overlay/work
|
||||
mount -t overlay -o upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work,lowerdir=/mnt/remote disklessroot /sysroot
|
||||
|
||||
Reference in New Issue
Block a user