From 6ab396cc1a839fdc5d57a1fc1bd46a61624feafc Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 12 Nov 2018 12:44:25 +0100 Subject: [dnbd3-rfs] hardcode config path to avoid issues and we don't really want to have it configurable anyways --- .../dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 4039440d..c827ec8d 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 @@ -14,11 +14,11 @@ logging.set_level debug [[ "$SLX_LOG_FILE_PATH" == "" ]] && SLX_LOG_FILE_PATH=/var/log/openslx logging.set_log_file "$SLX_LOG_FILE_PATH" -mkdir --parents "${NEWROOT}${SLX_CONFIGURATION_LOCATION}" -cp "/etc/openslx" "${NEWROOT}${SLX_CONFIGURATION_LOCATION}/config" +mkdir --parents "${NEWROOT}/opt/openslx" +cp "/etc/openslx" "${NEWROOT}/opt/openslx/config" -echo '## Generated by dracut in stage3' >> "${NEWROOT}${SLX_CONFIGURATION_LOCATION}/config" -cat "/run/openslx/pxe-network.conf" >> "${NEWROOT}${SLX_CONFIGURATION_LOCATION}/config" +echo "## Generated by '$0' in stage3" >> "${NEWROOT}/opt/openslx/config" +cat "/run/openslx/pxe-network.conf" >> "${NEWROOT}/opt/openslx/config" # Set root/demo password for stage4, if set if [ -n "${SLX_ROOT_PASS}" ]; then -- cgit v1.2.3-55-g7522