From 67176c732cb57c7009c632bcc3cc8f2e5af5d3b9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 19 Aug 2013 15:40:19 +0200 Subject: [PATCH] Use label ngcp-swap for the swap partition no matter whether LVM or not This should resolve the /dev/sda vs /dev/vda issue with our VMs. --- deployment.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment.sh b/deployment.sh index c9f1ef1..d28ca05 100755 --- a/deployment.sh +++ b/deployment.sh @@ -780,7 +780,7 @@ else # no LVM (default) SWAP_PARTITION="/dev/${DISK}2" echo "Initialising swap partition $SWAP_PARTITION" - mkswap "$SWAP_PARTITION" || die "Failed to initialise swap partition" + mkswap -L ngcp-swap "$SWAP_PARTITION" || die "Failed to initialise swap partition" fi # otherwise e2fsck fails with "need terminal for interactive repairs" @@ -874,9 +874,9 @@ sync mount "$ROOT_FS" "$TARGET" # provide useable swap partition -echo "Enabling swap partition $SWAP_PARTITION via /etc/fstab" +echo "Enabling swap partition with label ngcp-swap via /etc/fstab" cat >> "${TARGET}/etc/fstab" << EOF -$SWAP_PARTITION none swap sw,pri=0 0 0 +/dev/disk/by-label/ngcp-swap none swap sw,pri=0 0 0 EOF # removals: packages which debootstrap installs but d-i doesn't