summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2018-12-04 12:23:11 +0100
committerJonathan Bauer2018-12-04 12:23:11 +0100
commit2b3c7c92b43f09d3a8e8ff56667e502e5a367765 (patch)
treecd42bc9ddc10af85e7ae6fa60e87f2d5cf71f0cf
parentfix missing tools (diff)
downloadsystemd-init-2b3c7c92b43f09d3a8e8ff56667e502e5a367765.tar.gz
systemd-init-2b3c7c92b43f09d3a8e8ff56667e502e5a367765.tar.xz
systemd-init-2b3c7c92b43f09d3a8e8ff56667e502e5a367765.zip
[slx-part] fix swapped argument for fallback
-rwxr-xr-xbuilder/modules.d/slx-partitioner/scripts/slx_partitioner3
1 files changed, 2 insertions, 1 deletions
diff --git a/builder/modules.d/slx-partitioner/scripts/slx_partitioner b/builder/modules.d/slx-partitioner/scripts/slx_partitioner
index 098bc469..8c003787 100755
--- a/builder/modules.d/slx-partitioner/scripts/slx_partitioner
+++ b/builder/modules.d/slx-partitioner/scripts/slx_partitioner
@@ -135,6 +135,7 @@ ramdisk_fallback() {
while [ -b "/dev/mapper/$cow_device_candidate" ]; do
cow_device_candidate="root.$RANDOM"
done
+ # TODO fallback on thin-snapshot and not snapshot
if [ -z "$writable_device" ] || ! create_snapshot "$cow_device_candidate N"; then
emergency_shell "CRITICAL: failed to setup RAMdisk fallback."
exit 1
@@ -183,7 +184,7 @@ if [ -n "$SLX_WRITABLE_DEVICE_PARTITION_TABLE" ]; then
fi
# Default to thin-snapshot, if none were configured
if [ -z "$snapshot" ] && [ -z "$thin_snapshot" ]; then
- thin_snapshot="thin-snapshot root 0 10G"
+ thin_snapshot="thin-snapshot root 10G 0"
fi
# Sanity checks for weird configurations