mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 3/3] rc-once: Moved deletion of /system-update into function run_rc_once()
Date: Tue, 6 Jun 2017 18:02:51 +0200	[thread overview]
Message-ID: <20170606160251.j7zbiml3crlatlfo@pengutronix.de> (raw)
In-Reply-To: <20170606152849.69114-4-g.schenk@eckelmann.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

  reply	other threads:[~2017-06-06 16:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-06 15:28 [ptxdist] [PATCH 0/3] Using second offline update service beside rc-once in PTXDIST Gavin Schenk
2017-06-06 15:28 ` [ptxdist] [PATCH 1/3] rc-once: Use /etc/rc.once.d as link target in all rc-once scripts Gavin Schenk
2017-06-06 15:58   ` Michael Olbrich
2017-06-06 15:28 ` [ptxdist] [PATCH 2/3] rc-once: Use readlink to check where /system-update points to Gavin Schenk
2017-06-06 16:00   ` Michael Olbrich
2017-06-06 16:25     ` Uwe Kleine-König
2017-06-06 16:49       ` Michael Olbrich
2017-06-06 21:54         ` Uwe Kleine-König
2017-06-06 15:28 ` [ptxdist] [PATCH 3/3] rc-once: Moved deletion of /system-update into function run_rc_once() Gavin Schenk
2017-06-06 16:02   ` Michael Olbrich [this message]
2017-06-07  6:29     ` Schenk, Gavin

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=20170606160251.j7zbiml3crlatlfo@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox