From 9d4d552abc24d8f8dbce035b9c4940a8c468dd4d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 16 Jul 2019 10:34:41 +0200
Subject: [slx-partitioner] do not wipefs on swap by default

---
 builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'builder')

diff --git a/builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh b/builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh
index 092fb97f..bb37d6cf 100644
--- a/builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh
+++ b/builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh
@@ -8,7 +8,7 @@
 . /etc/openslx
 
 for swap_dev in \
-	$(get-partitions-by-id "82" "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f"); do
+	$(slx-tools dev_find_partitions "82" "0657fd6d-a4ab-43c4-84e5-0933c84b4f4f"); do
 
 	[ -z "$swap_dev" ] && continue
 
@@ -17,7 +17,7 @@ for swap_dev in \
 		>> "$NEWROOT/etc/fstab"
 	
 	# check if configured not to wipe any existing filesystem
-	[ "$SLX_WIPE_SWAP_DEVICE" = "no" ] && continue
+	[ "$SLX_WIPE_SWAP_DEVICE" = "yes" ] || continue
 
 	# create a drop-in to wipe the device's filesystem
 	swap_dev_systemd_escaped="$(tr '/' '-' <<< ${swap_dev:1})"
-- 
cgit v1.2.3-55-g7522