From 6127387be433280d3deec6e603462a7b6fe22793 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 16 Nov 2022 12:52:24 -0500 Subject: [PATCH] Ensure swap is skipped during cleanup too --- api-daemon/provisioner/examples/script/3-debootstrap.py | 1 + api-daemon/provisioner/examples/script/4-rinse.py | 1 + 2 files changed, 2 insertions(+) diff --git a/api-daemon/provisioner/examples/script/3-debootstrap.py b/api-daemon/provisioner/examples/script/3-debootstrap.py index 6d2fab93..0f1b270b 100644 --- a/api-daemon/provisioner/examples/script/3-debootstrap.py +++ b/api-daemon/provisioner/examples/script/3-debootstrap.py @@ -725,6 +725,7 @@ GRUB_DISABLE_LINUX_UUID=false if ( volume.get("source_volume") is None and volume.get("filesystem") is not None + and volume.get("filesystem") != "swap" ): # Unmount filesystem retcode, stdout, stderr = pvc_common.run_os_command( diff --git a/api-daemon/provisioner/examples/script/4-rinse.py b/api-daemon/provisioner/examples/script/4-rinse.py index de09e2e8..3ed35d23 100644 --- a/api-daemon/provisioner/examples/script/4-rinse.py +++ b/api-daemon/provisioner/examples/script/4-rinse.py @@ -718,6 +718,7 @@ GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --word=8 --parity=no --stop= if ( volume.get("source_volume") is None and volume.get("filesystem") is not None + and volume.get("filesystem") != "swap" ): # Unmount filesystem retcode, stdout, stderr = pvc_common.run_os_command(