emergency_shell: Use '\W' in $PS1 variable to show current working directory.
PATCH 1/1 emergency_shell: Use '\W' in $PS1 variable to show current working directory.
--- modules.d/98systemd/dracut-emergency.sh | 2 +- modules.d/99base/dracut-lib.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
modules.d/98systemd/dracut-emergency.sh +1 -1
@@ -29,7 +29,7 @@ if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then echo echo [ -f /etc/profile ] && . /etc/profile - [ -z "$PS1" ] && export PS1="$_name:\${PWD}# " + [ -z "$PS1" ] && export PS1="$_name:\W# " exec sh -i -l else warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line."
modules.d/99base/dracut-lib.sh +2 -2
@@ -906,7 +906,7 @@ _emergency_shell() local _name="$1" if [ -n "$DRACUT_SYSTEMD" ]; then > /.console_lock - echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile + echo "PS1=\"$_name:\W# \"" >/etc/profile systemctl start dracut-emergency.service rm -f /etc/profile rm -f /.console_lock
@@ -924,7 +924,7 @@ _emergency_shell() echo echo 'Dropping to debug shell.' echo - export PS1="$_name:\${PWD}# " + export PS1="$_name:\W# " [ -e /.profile ] || >/.profile _ctty="$(RD_DEBUG= getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
Signature · 1 line
1.8.1.4
A message that is not in the archive (sent off-list or not yet received): 1363064503-14783-1-git-send-email-chaowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Am 12.03.2013 06:01, schrieb WANG Chao:
Quoted 34 lines
Signed-off-by WANG Chao <[email protected]>--- modules.d/98systemd/dracut-emergency.sh | 2 +- modules.d/99base/dracut-lib.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)modules.d/98systemd/dracut-emergency.sh +1
-1@@ -29,7 +29,7 @@ if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then echo echo [ -f /etc/profile ] && . /etc/profile - [ -z "$PS1" ] && export PS1="$_name:\${PWD}# " + [ -z "$PS1" ] && export PS1="$_name:\W# " exec sh -i -l else warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line."modules.d/99base/dracut-lib.sh +1
-1@@ -906,7 +906,7 @@ _emergency_shell() local _name="$1" if [ -n "$DRACUT_SYSTEMD" ]; then > /.console_lock - echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile + echo "PS1=\"$_name:\W# \"" >/etc/profile systemctl start dracut-emergency.service rm -f /etc/profile rm -f /.console_lock
modules.d/99base/dracut-lib.sh _emergency_shell() · line 930
Quoted 8 lines
modules.d/99base/dracut-lib.sh +1
-1@@ -924,7 +924,7 @@ _emergency_shell() echo echo 'Dropping to debug shell.' echo - export PS1="$_name:\${PWD}# " + export PS1="$_name:\W# " [ -e /.profile ] || >/.profile _ctty="$(RD_DEBUG= getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"
\W does not work with dash.
Maybe you want:
export PS1="[$_name:\${PWD##*/}]# "
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 41 lines · Harald Hoyer
Am 12.03.2013 06:01, schrieb WANG Chao:
Quoted 40 lines
Signed-off-by WANG Chao <[email protected]>--- modules.d/98systemd/dracut-emergency.sh | 2 +- modules.d/99base/dracut-lib.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)modules.d/98systemd/dracut-emergency.sh +1
-1@@ -29,7 +29,7 @@ if getargbool 1 rd.shell -d -y rdshell || getarg rd.break -d rdbreak; then echo echo [ -f /etc/profile ] && . /etc/profile - [ -z "$PS1" ] && export PS1="$_name:\${PWD}# " + [ -z "$PS1" ] && export PS1="$_name:\W# " exec sh -i -l else warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line."modules.d/99base/dracut-lib.sh +2
-2@@ -906,7 +906,7 @@ _emergency_shell() local _name="$1" if [ -n "$DRACUT_SYSTEMD" ]; then > /.console_lock - echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile + echo "PS1=\"$_name:\W# \"" >/etc/profile systemctl start dracut-emergency.service rm -f /etc/profile rm -f /.console_lock@@ -924,7 +924,7 @@ _emergency_shell() echo echo 'Dropping to debug shell.' echo - export PS1="$_name:\${PWD}# " + export PS1="$_name:\W# " [ -e /.profile ] || >/.profile
Quoted 4 lines
modules.d/99base/dracut-lib.sh _emergency_shell() · line 930
Quoted 2 lines
modules.d/99base/dracut-lib.sh +0
-0_ctty="$(RD_DEBUG= getarg rd.ctty=)" && _ctty="/dev/${_ctty##*/}"\W does not work with dash.
I didn't take dash into consideration :(
Quoted 3 lines
Maybe you want:
export PS1="[$_name:\${PWD##*/}]# "
I didn't intend to break this long-working-directory convention. But ${PWD##*/} works for me.
The buggy line is:
echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile
In this case, /etc/profile will be PS1="name:${PWD}# ", and ${PWD} will be interpreted once at the time it being sourced.
It should be,
echo "PS1=\"$_name:\\\${PWD}# \"" >/etc/profile.
Patch is attached. Thanks!
WANG Chao
From cfbd73c9f527a4845459cc995985ee87ff510156 Mon Sep 17 00:00:00 2001
From: WANG Chao <[email protected]>
Date: Tue, 12 Mar 2013 17:52:31 +0800
Subject: [PATCH] _emergency_shell: don't let $PWD being interpreted when
export $PS1
--- modules.d/99base/dracut-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
modules.d/99base/dracut-lib.sh +1 -1
@@ -906,7 +906,7 @@ _emergency_shell() local _name="$1" if [ -n "$DRACUT_SYSTEMD" ]; then > /.console_lock - echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile + echo "PS1=\"$_name:\\\${PWD}# \"" >/etc/profile systemctl start dracut-emergency.service rm -f /etc/profile rm -f /.console_lock
Signature · 1 line
1.8.1.4