From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Aug 2021 09:29:58 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mJWJK-0003HU-R1 for lore@lore.pengutronix.de; Fri, 27 Aug 2021 09:29:58 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mJWJK-00059k-9y; Fri, 27 Aug 2021 09:29:58 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mJWJA-00059Z-CF for distrokit@pengutronix.de; Fri, 27 Aug 2021 09:29:53 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 8F815275 for ; Fri, 27 Aug 2021 09:29:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yX08GXk7ZNoU for ; Fri, 27 Aug 2021 09:29:47 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id 62C70EC6; Fri, 27 Aug 2021 09:29:47 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1mJWJ6-0007cx-LC for distrokit@pengutronix.de; Fri, 27 Aug 2021 09:29:44 +0200 From: Alexander Dahl To: distrokit@pengutronix.de Date: Fri, 27 Aug 2021 09:29:44 +0200 Message-Id: <20210827072944.29276-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [DistroKit] [PATCH] rc-once: Remove file identical to that in ptxdist X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 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