From: OpenBMC Patches <openbmc-patches@stwcx.xyz>
To: openbmc@lists.ozlabs.org
Subject: [PATCH openbmc 04/16] initfs: update: Don't exec sh or sulogin on error just exit 1
Date: Thu, 30 Jun 2016 18:50:21 -0500 [thread overview]
Message-ID: <20160630235033.17091-5-openbmc-patches@stwcx.xyz> (raw)
In-Reply-To: <20160630235033.17091-1-openbmc-patches@stwcx.xyz>
From: Milton Miller <miltonm@us.ibm.com>
When update was written it was exec'd from the shutdown script
and hence took over pid 1. Since exiting in that environment was
a panic situation, the script instead started a rescue shell with
its output presumably on the console.
The calling convention was updated to be a simple invocation in
commit dbacf104885c ("obmc-initfs: run update as a sub-script")
but the error handling was not updated. That error handling is
now becoming a hindrance to use from additional environments so
change it.
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
---
.../obmc-phosphor-initfs/files/obmc-update.sh | 23 ++++++----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
index aa8fd89..f8e551c 100755
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-initfs/files/obmc-update.sh
@@ -2,9 +2,6 @@
echo update: "$@"
-export PS1=update-sh#\
-# exec /bin/sh
-
cd /
if ! test -r /proc/mounts || ! test -f /proc/mounts
then
@@ -21,12 +18,12 @@ then
mkdir -p /dev
mount -t devtmpfs dev dev
fi
-while grep mtd /proc/mounts
-do
+
+if grep mtd /proc/mounts
+then
echo 1>&2 "Error: A mtd device is mounted."
- sulogin
- # exec /bin/sh
-done
+ exit 1
+fi
findmtd() {
m=$(grep -xl "$1" /sys/class/mtd/*/name)
@@ -130,7 +127,7 @@ do
if test -z "$m"
then
echo 1>&2 "Unable to find mtd partiton for ${f##*/}."
- exec /bin/sh
+ exit 1
fi
done
@@ -173,11 +170,3 @@ then
fi
exit
-
-# NOT REACHED without edit
-# NOT REACHED without edit
-
-echo "Flash completed. Inspect, cleanup and reboot -f to continue."
-
-export PS1=update-sh#\
-exec /bin/sh
--
2.9.0
next prev parent reply other threads:[~2016-06-30 23:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-30 23:50 [PATCH openbmc 00/16] Update flash update to be useable at runtime for v1.0-stable OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 01/16] image_types_uboot: Don't truncate when assembling flash OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 02/16] initfs: Fix recipe, remove unnecessary class OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 03/16] initfs: shutdown: comment on update success OpenBMC Patches
2016-06-30 23:50 ` OpenBMC Patches [this message]
2016-06-30 23:50 ` [PATCH openbmc 05/16] initfs: update: Do not cause an error if no files were saved OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 06/16] initfs: update: Consistently add ERROR: and print to stderr OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 07/16] initfs: update: add option to perform checks but skip actual update OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 08/16] initfs: update: check individual mtd partitions for mounts OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 09/16] initfs: update: add check for image size vs mtd size OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 10/16] initfs: update: add --help message OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 11/16] initfs: init: add file for base options OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 12/16] image-types_uboot: Package a self contained netboot image OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 13/16] initfs: update: handle no images to update OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 14/16] initfs: update: Sanitize whitelist directory entries OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 15/16] initfs: whitelist: Sanitize obmc events whitelist entry OpenBMC Patches
2016-06-30 23:50 ` [PATCH openbmc 16/16] initfs: Store whiltelist in a directory of files OpenBMC Patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160630235033.17091-5-openbmc-patches@stwcx.xyz \
--to=openbmc-patches@stwcx.xyz \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.