Fail on errors during setup-storage, parted and mkswap

Current daily VMs are known to fail because of switching from
raw image to vmdk on proxmox. :( Abort installation immediately
if actions during setup-storage, parted and mkswap fail.
ksolomko/vlan
Michael Prokop 13 years ago
parent 3655404727
commit c59b011d0e

@ -790,17 +790,17 @@ EOF
fi fi
export disklist=$(/usr/lib/fai/fai-disk-info | sort) export disklist=$(/usr/lib/fai/fai-disk-info | sort)
PATH=/usr/lib/fai:${PATH} setup-storage -f /tmp/partition_setup.txt -X PATH=/usr/lib/fai:${PATH} setup-storage -f /tmp/partition_setup.txt -X || exit 1
# used later by installer # used later by installer
ROOT_FS="/dev/mapper/ngcp-root" ROOT_FS="/dev/mapper/ngcp-root"
SWAP_PARTITION="/dev/mapper/ngcp-swap" SWAP_PARTITION="/dev/mapper/ngcp-swap"
else # no LVM (default) else # no LVM (default)
parted -s /dev/${DISK} mktable "$TABLE" parted -s /dev/${DISK} mktable "$TABLE" || exit 1
# hw-raid with rootfs + swap partition # hw-raid with rootfs + swap partition
parted -s /dev/${DISK} 'mkpart primary ext4 2048s 95%' parted -s /dev/${DISK} 'mkpart primary ext4 2048s 95%' || exit 1
parted -s /dev/${DISK} 'mkpart primary linux-swap 95% -1' parted -s /dev/${DISK} 'mkpart primary linux-swap 95% -1' || exit 1
sync sync
# used later by installer # used later by installer
@ -808,7 +808,7 @@ else # no LVM (default)
SWAP_PARTITION="/dev/${DISK}2" SWAP_PARTITION="/dev/${DISK}2"
echo "Initialising swap partition $SWAP_PARTITION" echo "Initialising swap partition $SWAP_PARTITION"
mkswap "$SWAP_PARTITION" mkswap "$SWAP_PARTITION" || exit 1
fi fi
# otherwise e2fsck fails with "need terminal for interactive repairs" # otherwise e2fsck fails with "need terminal for interactive repairs"

Loading…
Cancel
Save