From b6ea0ba1de82e0942f4bbaa52dc9da5d486f18af Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Sun, 10 May 2020 18:15:42 +0200 Subject: [PATCH] {nokia-n900,samsung-i9070}: move swclock initial timestamp back to postmaketos-base.post-install (MR 1166) --- .../testing/device-nokia-n900/device-nokia-n900.post-install | 4 ---- .../device-samsung-i9070/device-samsung-i9070.post-install | 4 +--- main/postmarketos-base/postmarketos-base.post-install | 4 ++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/device/testing/device-nokia-n900/device-nokia-n900.post-install b/device/testing/device-nokia-n900/device-nokia-n900.post-install index 242e70585..a74aea199 100644 --- a/device/testing/device-nokia-n900/device-nokia-n900.post-install +++ b/device/testing/device-nokia-n900/device-nokia-n900.post-install @@ -25,8 +25,4 @@ if [ -z "$(grep /dev/rtc0 /etc/conf.d/hwclock)" ]; then sed -i 's/clock_args=\"/clock_args=\" -f \/dev\/rtc/' /etc/conf.d/hwclock fi -# Prime swclock with a reasonable date/time on first boot -mkdir -p /run/openrc -touch /run/openrc/shutdowntime - exit 0 diff --git a/device/testing/device-samsung-i9070/device-samsung-i9070.post-install b/device/testing/device-samsung-i9070/device-samsung-i9070.post-install index 7b597080c..eae2394a6 100644 --- a/device/testing/device-samsung-i9070/device-samsung-i9070.post-install +++ b/device/testing/device-samsung-i9070/device-samsung-i9070.post-install @@ -3,6 +3,4 @@ # Enable swclock OpenRC service rc-update -q add swclock boot -# Prime swclock with a reasonable date/time on first boot -mkdir -p /run/openrc -touch /run/openrc/shutdowntime +exit 0 diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install index 7268ef03b..54b764a4d 100644 --- a/main/postmarketos-base/postmarketos-base.post-install +++ b/main/postmarketos-base/postmarketos-base.post-install @@ -18,6 +18,10 @@ for service in mount-ro killprocs savecache; do rc-update -q add $service shutdown done +# Prime swclock with a reasonable date/time on first boot +mkdir -p /run/openrc +touch /run/openrc/shutdowntime + # Replace a config file from stock Alpine, unless apk reports that the user has # modified it (note that this does not allow properly updating these configs # when postmarketos-base gets updated yet, see issue pmaports#258).