From cca02597c86902e168c9968d2de51ce3f782f400 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 17 Nov 2022 10:24:38 +0100 Subject: [PATCH] image: remove bash options from sourced scripts Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- image/mkosi.skeleton/etc/profile.d/constellation.sh | 3 +-- .../lib/dracut/modules.d/38azure-provision/module-setup.sh | 4 +--- .../dracut/modules.d/39constellation-mount/module-setup.sh | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/image/mkosi.skeleton/etc/profile.d/constellation.sh b/image/mkosi.skeleton/etc/profile.d/constellation.sh index c3dab9e8d..a1b519aac 100755 --- a/image/mkosi.skeleton/etc/profile.d/constellation.sh +++ b/image/mkosi.skeleton/etc/profile.d/constellation.sh @@ -3,8 +3,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -set -euo pipefail -shopt -s inherit_errexit +# Note: This script is sourced. export PATH=/run/state/bin:${PATH} export KUBECONFIG=/etc/kubernetes/admin.conf diff --git a/image/mkosi.skeleton/usr/lib/dracut/modules.d/38azure-provision/module-setup.sh b/image/mkosi.skeleton/usr/lib/dracut/modules.d/38azure-provision/module-setup.sh index a5cbbae7c..98d0f3c58 100755 --- a/image/mkosi.skeleton/usr/lib/dracut/modules.d/38azure-provision/module-setup.sh +++ b/image/mkosi.skeleton/usr/lib/dracut/modules.d/38azure-provision/module-setup.sh @@ -3,9 +3,7 @@ # # SPDX-License-Identifier: AGPL-3.0-only -# warning: file is loaded by dracut, so default "set" and "shopt" options are not set -# set -euo pipefail -# shopt -s inherit_errexit +# Note: This script is sourced. depends() { echo systemd diff --git a/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh index 9ea2f62fd..3e7acdf34 100644 --- a/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh +++ b/image/mkosi.skeleton/usr/lib/dracut/modules.d/39constellation-mount/module-setup.sh @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: AGPL-3.0-only +# Note: This script is sourced. + depends() { # expands to: systemd systemd-hostnamed systemd-networkd systemd-resolved systemd-timedated systemd-timesyncd echo systemd-network-management