[PATCH openbmc 6/7] obmc-initfs: run update as a sub-script

[Brad Bishop]

Reviewed-by: Brad Bishop <brad at bwbmail.net>

> On Feb 6, 2016, at 7:00 PM, OpenBMC Patches <openbmc-patches at stwcx.xyz> wrote:
> 
> From: Milton Miller <miltonm at us.ibm.com>
> 
> The update script has replicated logic to do the final reboot, kexec,
> halt, or poweroff command.  Instead of transferring control via exec
> just call it as a normal command, and return to shutdown for the
> final mounted fs debug print and command.
> 
> Signed-off-by: Milton Miller <miltonm at us.ibm.com>
> ---
> .../obmc-phosphor-initfs/files/obmc-shutdown.sh           |  3 +--
> .../obmc-phosphor-initfs/files/obmc-update.sh             | 15 ++++-----------
> 2 files changed, 5 insertions(+), 13 deletions(-)
> 
> 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 d530265..7d1157a 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
> @@ -34,7 +34,7 @@ fi
> 
> if test -x /update && ls $image* > /dev/null 2>&1
> then
> -	exec /update ${1+"$@"}
> +	/update ${1+"$@"}
> fi
> 
> echo Remaining mounts:
> @@ -43,7 +43,6 @@ cat /proc/mounts
> test "umount_proc" && umount /proc && rmdir /proc
> 
> 
> -
> # Execute the command systemd told us to ...
> if test -d /oldroot  && test "$1"
> then
> 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 ec4a769..3cf6bc3 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
> @@ -92,19 +92,12 @@ then
> 	umount $rwdir
> fi
> 
> -# Execute the command systemd told us to ...
> -if test -d /oldroot && test -x "/sbin/$1" && test -f "/sbin/$1"
> -then
> -	if test "$1" == kexec
> -	then
> -		/sbin/$1 -f -e
> -	else
> -		/sbin/$1 -f
> -	fi
> -fi
> +exit
> 
> +# NOT REACHED without edit
> +# NOT REACHED without edit
> 
> -echo "Execute ${1-reboot} -f if all is ok"
> +echo "Flash completed.  Inspect, cleanup and reboot -f to continue."
> 
> export PS1=update-sh#\ 
> exec /bin/sh
> -- 
> 2.6.4
> 
> 
> _______________________________________________
> openbmc mailing list
> openbmc at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc