[DistroKit] [PATCH] rc-once: Remove file identical to that in ptxdist

[DistroKit] [PATCH] rc-once: Remove file identical to that in ptxdist

[Alexander Dahl]

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

Re: [DistroKit] [PATCH] rc-once: Remove file identical to that in ptxdist

[Robert Schwebel]

On Fri, Aug 27, 2021 at 09:29:44AM +0200, Alexander Dahl wrote:
> 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

Thanks, applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de