Re: [ptxdist] [PATCH 3/3] rc-once: Moved deletion of /system-update into function run_rc_once()

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Jun 06, 2017 at 05:28:49PM +0200, Gavin Schenk wrote:
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> ---
>  projectroot/usr/lib/init/rc-once.sh         | 1 +
>  projectroot/usr/lib/systemd/systemd-rc-once | 4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/projectroot/usr/lib/init/rc-once.sh b/projectroot/usr/lib/init/rc-once.sh
> index d225ad5c2..a9c08c48a 100644
> --- a/projectroot/usr/lib/init/rc-once.sh
> +++ b/projectroot/usr/lib/init/rc-once.sh
> @@ -12,6 +12,7 @@ run_rc_once() {
>  		return $failed
>  	fi
>  	echo "running rc.once.d services..."
> +	rm -f /system-update

This script is also used for bbinit, where /system-update means nothing. An
this changes the semantics: Currently /system-update remains is a rc-once
script fails. That no longer happens with this change.

Michael

>  	cd "$RC_ONCE_DIR" || exit 1
>  	mkdir -p "$DONE_DIR"
>  	for script in *; do
> diff --git a/projectroot/usr/lib/systemd/systemd-rc-once b/projectroot/usr/lib/systemd/systemd-rc-once
> index ff7f7d3dc..5dfecf2aa 100644
> --- a/projectroot/usr/lib/systemd/systemd-rc-once
> +++ b/projectroot/usr/lib/systemd/systemd-rc-once
> @@ -8,9 +8,7 @@ start() {
>  		systemctl rescue
>  		exit 1
>  	fi
> -	if run_rc_once; then
> -		rm -f /system-update
> -	fi
> +	run_rc_once
>  	systemctl daemon-reexec
>  	sleep 1
>  	touch /var/lib/systemd/clock
> -- 
> 2.13.0
> 
> 
> Eckelmann AG
> Vorstand: Dipl.-Ing. Peter Frankenbach (Sprecher) Dipl.-Wi.-Ing. Philipp Eckelmann
> Dr.-Ing. Marco Münchhof Dr.-Ing. Frank Uhlemann
> Vorsitzender des Aufsichtsrats: Hubertus G. Krossa
> Stv. Vorsitzender des Aufsichtsrats: Dr.-Ing. Gerd Eckelmann
> Sitz der Gesellschaft: Berliner Str. 161, 65205 Wiesbaden, Amtsgericht Wiesbaden HRB 12636
> http://www.eckelmann.de 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de