summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2016-01-28 17:23:27 +0100
committertorben2016-01-28 17:23:27 +0100
commit560aebc2efc10a81ae23ac262a64633accbd085e (patch)
tree31114cc08437ea19589b9695e87dd55d0f113df6
parentMerge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff)
downloadsystemd-init-560aebc2efc10a81ae23ac262a64633accbd085e.tar.gz
systemd-init-560aebc2efc10a81ae23ac262a64633accbd085e.tar.xz
systemd-init-560aebc2efc10a81ae23ac262a64633accbd085e.zip
Fix.
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh3
m---------builder/dnbd3-rootfs/scripts/rebash0
2 files changed, 0 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index be327555..71d64b3a 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -102,9 +102,6 @@ if [ -z "$SLX_SYSTEM_PARTITION_PREPARATION_SCRIPT" ]; then
read_only_partition="$(utils.find_block_device \
"$SLX_SYSTEM_PARTITION_IDENTIFIER" "$read_only_device")"
else
- logging.plain
- logging.plain "$SLX_SYSTEM_PARTITION_PREPARATION_SCRIPT"
- logging.plain
eval "$SLX_SYSTEM_PARTITION_PREPARATION_SCRIPT"
fi
if [[ ! $? || -z "$read_only_partition" ]]; then
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
-Subproject 96e6914cb1ab15d243efe065f51306bae866a99
+Subproject 46681d9d6caef2c14b10f4512f12176a7b0c1f4