diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2023-11-15 21:00:34 +0300 |
|---|---|---|
| committer | Zev Weiss <zev@bewilderbeest.net> | 2023-11-15 21:12:34 +0300 |
| commit | 4a2d35f54b2e3fdd88a1f99254e293a0699fb21d (patch) | |
| tree | 0d7c3a3b2ef8302b8e43076cb1f416d24fd34bc0 | |
| parent | 6e311d3c6e79b782f3232504262f5674445493db (diff) | |
| download | openbmc-4a2d35f54b2e3fdd88a1f99254e293a0699fb21d.tar.xz | |
meta-phosphor: initrdscripts: Fix broken PS1 assignments
Commit 51d6af4e64f0 ("meta-phosphor: initrdscripts: fix shellcheck
issues") fixed some shellcheck trailing-space errors the wrong way,
removing the trailing space instead of removing the backslash and
quoting it. This caused the following lines to be gobbled up into the
variable assignment instead of being executed as their own commands,
which in these particular cases led to kernel panics due to pid 1
exiting (insteading of dropping into an interactive shell as intended).
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I8bda0efe825b34abc5219f17fdddc6d7fc57d74f
| -rw-r--r-- | meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh | 2 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh index 3df371fbc1..186c31ade0 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-init.sh @@ -156,7 +156,7 @@ When finished exec new init or cleanup and run reboot -f. Warning: No job control! Shell exit will panic the system! HERE - export PS1=init#\ + export PS1="init# " exec /bin/sh fi } diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh index 9bafcfe217..ddea48c7d7 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/files/obmc-shutdown.sh @@ -101,5 +101,5 @@ fi echo "Execute ${1-reboot} -f if all unmounted ok, or exec /init" -export PS1=shutdown-sh#\ +export PS1="shutdown-sh# " exec /bin/sh |