summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-11-19 14:35:04 +0100
committerJonathan Bauer2019-11-19 14:35:04 +0100
commit3b10c5633301f199dda19f1d90135e3c0e9468e5 (patch)
treea808afb73d300cf55f6afa8634fd668ebd95f786
parentchange branch... (diff)
downloadsystemd-init-3b10c5633301f199dda19f1d90135e3c0e9468e5.tar.gz
systemd-init-3b10c5633301f199dda19f1d90135e3c0e9468e5.tar.xz
systemd-init-3b10c5633301f199dda19f1d90135e3c0e9468e5.zip
fix math
-rwxr-xr-xbuilder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device10
1 files changed, 5 insertions, 5 deletions
diff --git a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device b/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
index ac1d5234..d65c0dbb 100755
--- a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
+++ b/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
@@ -147,12 +147,12 @@ ramdisk_fallback() {
local ram_size_in_kb="$(awk '/MemTotal/ {printf("%d\n", $2 )}' /proc/meminfo)"
modprobe dm-zero
# fill the qcow2 device with a zero device to make it larger than it is
- dmsetup_create_noudevsync filler "0 $(( ram_size_in_kb / 2 )) zero"
- echo "0 $(( read_only_device_size / 2 )) linear $read_only_device 0
- 0 $(( ram_size_in_kb / 2 )) linear /dev/mapper/filler 0" | dmsetup create bigger --noudevsync
+ dmsetup_create_noudevsync filler "0 $ram_size_in_kb zero"
+ echo "0 $read_only_device_size linear $read_only_device 0
+ $read_only_device_size $ram_size_in_kb linear /dev/mapper/filler 0" | dmsetup create bigger --noudevsync
dmsetup mknodes --noudevsync bigger
- # Use the qcow size + half the RAM as tmpfs size.
+ # Use the qcow size + ***************half************* the RAM as tmpfs size.
local cow_size="$(( qcow_size_in_kb + ( ram_size_in_kb / 2 ) ))"
if ! mount -t tmpfs tmpfs -o size="${cow_size}k" "$cow_tmpfs"; then
emergency_shell "Failed to prepare dedicated CoW tmpfs in $cow_tmpfs of size $cow_size."
@@ -164,7 +164,7 @@ ramdisk_fallback() {
fi
writable_device="$(losetup --show --find "$file")"
read_only_device=/dev/mapper/bigger
- read_only_device_size="$cow_size"
+ read_only_device_size="$(( read_only_device_size + ram_size_in_kb ))"
cow_device_candidate="root"
while [ -b "/dev/mapper/$cow_device_candidate" ]; do
cow_device_candidate="root.$RANDOM"