summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2016-03-22 16:24:57 +0100
committertorben2016-03-22 16:24:57 +0100
commit3dfa5a1b7e27942cedf445adb6d0f29227760a1d (patch)
tree2ae550a3c91c94a380b336bb3235cfe64f9e9a36
parentFix. (diff)
downloadsystemd-init-3dfa5a1b7e27942cedf445adb6d0f29227760a1d.tar.gz
systemd-init-3dfa5a1b7e27942cedf445adb6d0f29227760a1d.tar.xz
systemd-init-3dfa5a1b7e27942cedf445adb6d0f29227760a1d.zip
Fix dependency check.
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/fetch-config.sh2
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh1
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/mount-root-device.sh2
-rwxr-xr-xbuilder/dnbd3-rootfs/hooks/prepare-root-partition.sh4
7 files changed, 8 insertions, 4 deletions
diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
index ba66ddc3..a1554752 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
@@ -4,6 +4,7 @@
source '/usr/lib/rebash/core.sh'
core.import exceptions
core.import logging
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
index 2c44a5fe..f0a07dfb 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
@@ -4,6 +4,7 @@
source '/usr/lib/rebash/core.sh'
core.import exceptions
core.import logging
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
index e09fb173..8bf51724 100755
--- a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
@@ -4,6 +4,7 @@
source '/usr/lib/rebash/core.sh'
core.import exceptions
core.import logging
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/fetch-config.sh b/builder/dnbd3-rootfs/hooks/fetch-config.sh
index 09df76eb..0b8d5a0a 100755
--- a/builder/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/builder/dnbd3-rootfs/hooks/fetch-config.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
# -*- coding: utf-8 -*-
# region imports
-type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh
source '/usr/lib/rebash/core.sh'
core.import exceptions
core.import logging
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index c3875fcb..fe153265 100755
--- a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
@@ -4,6 +4,7 @@
source '/usr/lib/rebash/core.sh'
core.import exceptions
core.import logging
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
index 519f8730..49bfcdc6 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/dnbd3-rootfs/hooks/mount-root-device.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
# -*- coding: utf-8 -*-
# region imports
-type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh
source '/usr/lib/rebash/core.sh'
core.import exceptions
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 435e669a..79cb6225 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
# region imports
source '/usr/lib/rebash/core.sh'
-core.import "/usr/lib/openslx/tools.sh"
+core.import '/usr/lib/openslx/tools.sh'
core.import exceptions
core.import utils
core.import logging
-type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh
+type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
# endregion
exceptions.try
{