Improve shell config.

2 files changed, 26 insertions, 1 deletions

diff --git a/builder/dnbd3-rootfs/hooks/configure-emergency-shell.sh b/builder/dnbd3-rootfs/hooks/configure-emergency-shell.sh
new file mode 100755
index 00000000..c3ad1977
--- /dev/null
+++ b/builder/dnbd3-rootfs/hooks/configure-emergency-shell.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# region imports
+type getarg >/dev/null 2>&1 || source /lib/dracut-lib.sh
+source "/usr/lib/rebash/core.sh"
+core.import exceptions
+exceptions.activate
+core.import utils
+core.import logging
+# endregion
+( # subshell for variable scoping
+logging.set_commands_level debug
+logging.set_level debug
+
+temporary_file="$(mktemp)"
+cat '/etc/bash.bashrc' '/etc/profile' >"$temporary_file"
+mv "$temporary_file" '/etc/profile'
+
+) || exit $?
+exceptions.deactivate
+# region vim modline
+
+# vim: set tabstop=4 shiftwidth=4 expandtab:
+# vim: foldmethod=marker foldmarker=region,endregion:
+
+# endregion
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 257d71ab..1f173ab9 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -141,6 +141,7 @@ install() {
     # endregion
     # region hooks
     inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
+    inst_hook cmdline 00 "$moddir/hooks/configure-emergency-shell.sh"
     inst_hook cmdline 10 "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
     inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
     # load dnbd3.ko
@@ -188,7 +189,6 @@ install() {
     # Set some aliases for the initramfs context.
     if [[ "$_debug" == 0 ]]; then
         inst "$moddir/configuration/bash" '/etc/bash.bashrc'
-        inst "$moddir/configuration/bash" '/etc/profile.d/aliases'
     fi
     # endregion
     inst_multiple \