diff options
| author | Jonathan Bauer | 2019-07-16 10:34:41 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-07-16 10:34:41 +0200 |
| commit | 9d4d552abc24d8f8dbce035b9c4940a8c468dd4d (patch) | |
| tree | 707b6f725f033829fa46afd36b802e13b0e37a8f /builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh | |
| parent | [systemd-networkd-ext] fix kcl bridged detect (diff) | |
| download | systemd-init-9d4d552abc24d8f8dbce035b9c4940a8c468dd4d.tar.gz systemd-init-9d4d552abc24d8f8dbce035b9c4940a8c468dd4d.tar.xz systemd-init-9d4d552abc24d8f8dbce035b9c4940a8c468dd4d.zip | |
[slx-partitioner] do not wipefs on swap by default
Diffstat (limited to 'builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh')
| -rw-r--r-- | builder/modules.d/slx-partitioner/scripts/generate-fstab-swap.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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})" |