diff options
| author | jandob | 2016-02-05 21:03:39 +0100 |
|---|---|---|
| committer | jandob | 2016-02-05 21:03:39 +0100 |
| commit | afb3253e83038ecde407d9f4523f37aab5049d12 (patch) | |
| tree | f72043f3eb0b1f32b3e04e57956a2af4dd66899a /builder/dnbd3-rootfs | |
| parent | support systemd shutdown pivot root back to initramfs (diff) | |
| parent | Fix submodules. (diff) | |
| download | systemd-init-afb3253e83038ecde407d9f4523f37aab5049d12.tar.gz systemd-init-afb3253e83038ecde407d9f4523f37aab5049d12.tar.xz systemd-init-afb3253e83038ecde407d9f4523f37aab5049d12.zip | |
merge
Diffstat (limited to 'builder/dnbd3-rootfs')
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/fetch-config.sh | 4 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/prepare-root-partition.sh | 6 | ||||
| m--------- | builder/dnbd3-rootfs/scripts/rebash | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/hooks/fetch-config.sh b/builder/dnbd3-rootfs/hooks/fetch-config.sh index 709d49a9..f8c0257d 100755 --- a/builder/dnbd3-rootfs/hooks/fetch-config.sh +++ b/builder/dnbd3-rootfs/hooks/fetch-config.sh @@ -8,8 +8,8 @@ core.import utils core.import logging # endregion ( # subshell for variable scoping -logging.set_commands_log_level debug -logging.set_log_level debug +logging.set_commands_level debug +logging.set_level debug # TODO make configurable via kernel command line configuration_file_name='config' diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh index 0ad0af14..1cd5a5be 100755 --- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -6,8 +6,8 @@ core.import exceptions exceptions.activate core.import utils core.import logging -logging.set_commands_log_level debug -logging.set_log_level debug +logging.set_commands_level debug +logging.set_level debug # endregion ( # subshell for variable scoping @@ -49,7 +49,7 @@ else #modprobe brd max_part=1 rd_size="$ramdisk_size" #writable_device='/dev/ram0' ramdisk_location="$(mktemp)" - dd of="$ramdisk_location" seek="$ramdisk_size" count=0 + dd of="$ramdisk_location" seek="$ramdisk_size" count=0 1>/dev/null writable_device="$(losetup --find)" losetup "$writable_device" "$ramdisk_location" # diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash -Subproject 96e6914cb1ab15d243efe065f51306bae866a99 +Subproject 944af32773b53acee0920f34fe024463b2c888f |