[PATCH openbmc 01/32] shutdown: Conditionally unmount proc

OpenBMC Patches openbmc-patches at stwcx.xyz
Sat Mar 5 23:29:52 AEDT 2016


From: "Milton D. Miller II" <miltonm at us.ibm.com>

The intention was to test the flag variable set when proc was
mounted earlier in the script, not the constant string containing
the name of the variable.

The unnecessary unmount is not noticeable when a normal shutdown
or reboot is being performed while executing after systemd, but
results in a less usable environment when invoked manually.

Signed-off-by: Milton Miller <miltonm at us.ibm.com>
---
 .../common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
index fc359c5..216e7e4 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-shutdown.sh
@@ -45,7 +45,7 @@ fi
 echo Remaining mounts:
 cat /proc/mounts
 
-test "umount_proc" && umount /proc && rmdir /proc
+test "$umount_proc" && umount /proc && rmdir /proc
 
 # ioctl(TIOC_DRAIN) to drain tty messages to console
 test -t 1 && stty cooked 0<&1
-- 
2.7.1




More information about the openbmc mailing list