diff options
| author | Thiago Abdo | 2019-11-04 10:45:16 +0100 |
|---|---|---|
| committer | Thiago Abdo | 2019-11-04 10:45:16 +0100 |
| commit | 578f27323e00c437a632134fb376c3d38d5db84e (patch) | |
| tree | 7ff90e442241596a77b9019cc186f2012cf4de14 /builder | |
| parent | Fix commit reference of dnbd3-ng submodule (diff) | |
| parent | Removes logging configuration from exception, probabily in bash 4.4.19 they d... (diff) | |
| download | systemd-init-578f27323e00c437a632134fb376c3d38d5db84e.tar.gz systemd-init-578f27323e00c437a632134fb376c3d38d5db84e.tar.xz systemd-init-578f27323e00c437a632134fb376c3d38d5db84e.zip | |
Merge branch 'centos8' of git.openslx.org:openslx-ng/systemd-init into centos8
Diffstat (limited to 'builder')
5 files changed, 14 insertions, 5 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux -Subproject f9b4646c47caf5c123a32d24cf3d84bb2928771 +Subproject 0761b3e9e03ed63b4adfd8b4a82f334352729a4 diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index 3a0cd5a3..ab5418d4 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -248,6 +248,7 @@ build_compile_losetup_qcow() { ./autogen.sh ./configure make -j losetup + gcc -I./libsmartcols/src -O2 -o .libs/losetup sys-utils/losetup-losetup.o .libs/libcommon.a .libs/libsmartcols.a ) local ret=$? popd diff --git a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh index 12dab27d..bb8feccc 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh @@ -6,13 +6,13 @@ core.import exceptions core.import logging type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh # endregion -exceptions.try -{ -source "/etc/openslx" logging.set_commands_level debug logging.set_level debug [[ "$SLX_LOG_FILE_PATH" == "" ]] && SLX_LOG_FILE_PATH=/var/log/openslx logging.set_log_file "$SLX_LOG_FILE_PATH" +exceptions.try +{ +source "/etc/openslx" mkdir --parents "${NEWROOT}/opt/openslx" cp "/etc/openslx" "${NEWROOT}/opt/openslx/config" diff --git a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh index a5aceab6..36e4f091 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh @@ -1,17 +1,19 @@ #!/usr/bin/env bash # -*- coding: utf-8 -*- # region imports + +sleep 10 source '/usr/lib/rebash/core.sh' core.import exceptions type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh # endregion -exceptions.try -{ logging.set_commands_level debug logging.set_level debug [[ "$SLX_LOG_FILE_PATH" == "" ]] && SLX_LOG_FILE_PATH=/var/log/openslx logging.set_log_file "$SLX_LOG_FILE_PATH" +exceptions.try +{ if ! getarg root=; then source "/etc/openslx" mount "$SLX_DNBD3_DEVICE_COW" "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS diff --git a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh index 619226f5..8b5343cc 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -3,6 +3,12 @@ type emergency_shell > /dev/null 2>&1 || source /lib/dracut-lib.sh source /etc/openslx source '/usr/lib/rebash/core.sh' + +export PATH="/usr/local/bin:$PATH" + +# quick fix, this must not be here! +export LD_LIBRARY_PATH="/usr/local/lib" + core.import exceptions core.import logging # endregion |