DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: distrokit@pengutronix.de
Subject: [DistroKit] [PATCH] rc-once: Remove file identical to that in ptxdist
Date: Fri, 27 Aug 2021 09:29:44 +0200	[thread overview]
Message-ID: <20210827072944.29276-1-ada@thorsis.com> (raw)

The fix introduced here with b3893427b94d ("rc-once: make sure ssh key
material is synced to disk") has made it into ptxdist-2020.09.0, the
file is basically identical now and therefor not needed in this BSP
anymore.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Fixes: 0734dacb1929 ("PTXdist: migrate 2020.08.0 -> 2020.09.0")
---
 projectroot/usr/lib/systemd/systemd-rc-once | 56 ---------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 projectroot/usr/lib/systemd/systemd-rc-once

diff --git a/projectroot/usr/lib/systemd/systemd-rc-once b/projectroot/usr/lib/systemd/systemd-rc-once
deleted file mode 100644
index 58e5c27..0000000
--- a/projectroot/usr/lib/systemd/systemd-rc-once
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-. /lib/init/initmethod-bbinit-functions.sh
-. /lib/init/rc-once.sh
-
-start() {
-	if ! mount_root_rw; then
-		systemctl --no-block rescue
-		exit 1
-	fi
-	if run_rc_once; then
-		rm -f /system-update
-	fi
-	systemctl daemon-reexec
-	sleep 1
-	if [ -d /var/lib/systemd/timesync ]; then
-		touch /var/lib/systemd/timesync/clock
-		chown systemd-timesync:nogroup /var/lib/systemd/timesync/clock
-	fi
-	exec "$0" umount
-}
-
-umount() {
-	# make sure data makes it's way to the medium
-	sync
-	if ! mount_root_restore; then
-		# remounting rw/ro during the second boot will flush anything
-		# left in the filesystem journal
-		ln -sf /etc/rc.once.d /system-update
-		systemctl --no-block reboot
-	else
-		if [ -e /system-update ]; then
-			systemctl --no-block rescue
-		else
-			systemctl --no-block default
-		fi
-	fi
-}
-
-case "$1" in
-
-	start|"")
-		start
-		;;
-	umount)
-		umount
-		;;
-	*)
-		echo "Usage: $0 {start|umount}" >&2
-		exit 1
-		;;
-esac
-
-exit 0
-
-

base-commit: fb16d6047817d1abffe1fe9652cfe4ea36ad25e5
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


             reply	other threads:[~2021-08-27  7:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-27  7:29 Alexander Dahl [this message]
2021-08-27  8:24 ` Robert Schwebel

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=20210827072944.29276-1-ada@thorsis.com \
    --to=ada@thorsis.com \
    --cc=distrokit@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