From 05d334b707696835f633a05f6f188b9711e9f687 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:14:41 +0200 Subject: Changes branch of kernel-qcow2-linux Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builder') diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux index f9b4646c..4f7e7466 160000 --- a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux +++ b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux @@ -1 +1 @@ -Subproject commit f9b4646c47caf5c123a32d24cf3d84bb2928771b +Subproject commit 4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 -- cgit v1.2.3-55-g7522 From 33149f1971ba6b055b87d52c0a7fc04142d46bb5 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:29:25 +0200 Subject: Upgrade commit of kernel-qcow2-linux Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builder') diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux index 4f7e7466..0761b3e9 160000 --- a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux +++ b/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux @@ -1 +1 @@ -Subproject commit 4f7e7466ad6b3c52b4ce4ea0c35fbea02de04bc5 +Subproject commit 0761b3e9e03ed63b4adfd8b4a82f334352729a44 -- cgit v1.2.3-55-g7522 From a1a1bda3b5927b5bf825e1b179db267a0cb3ce3c Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 13:45:21 +0200 Subject: Changes the compiling of losetup to compily with static libraries and shared gcc Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'builder') 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 -- cgit v1.2.3-55-g7522 From 0bbbf1f2ffddde6e4cf81bb768c7176dcb7f722e Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 14:13:58 +0200 Subject: use full dinamicly linked losetup Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'builder') diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/builder/modules.d/dnbd3-rootfs/helper/build.inc index ab5418d4..3a0cd5a3 100644 --- a/builder/modules.d/dnbd3-rootfs/helper/build.inc +++ b/builder/modules.d/dnbd3-rootfs/helper/build.inc @@ -248,7 +248,6 @@ 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 -- cgit v1.2.3-55-g7522 From 254ca4a14bf5c9054fdaaa871b89bd87735bbb15 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 15:28:28 +0200 Subject: add path to prepare-root Signed-off-by: Thiago Abdo --- builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'builder') 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 -- cgit v1.2.3-55-g7522 From 78bd4c12d63e9116253449b60a10e9c812891c4b Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 16:00:53 +0200 Subject: Revert "use full dinamicly linked losetup" This reverts commit 0bbbf1f2ffddde6e4cf81bb768c7176dcb7f722e. --- builder/modules.d/dnbd3-rootfs/helper/build.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'builder') 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 -- cgit v1.2.3-55-g7522 From 3eff3fcd9db6ac10e7df8f76f75c5d14e5e66568 Mon Sep 17 00:00:00 2001 From: Thiago Abdo Date: Tue, 15 Oct 2019 17:05:20 +0200 Subject: Removes logging configuration from exception, probabily in bash 4.4.19 they does not work Signed-off-by: Thiago Abdo --- .../dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh | 6 +++--- builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'builder') 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 -- cgit v1.2.3-55-g7522