From 1a95cafac8876ac9ecca2b671b69d9c81a4a4113 Mon Sep 17 00:00:00 2001
From: Thorsten Töpper <atsutane-aur@freethoughts.de>
Date: Wed, 4 Sep 2024 19:28:45 +0200
Subject: Fix version string generation & sync with core/systemd

---
 systemd.install | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'systemd.install')

diff --git a/systemd.install b/systemd.install
index 536e54d..9f01f18 100644
--- a/systemd.install
+++ b/systemd.install
@@ -13,14 +13,9 @@ add_journal_acls() {
 post_common() {
   systemd-sysusers
   journalctl --update-catalog
-}
 
-_242_0_2_changes() {
-  if [[ -L var/lib/systemd/timesync ]]; then
-    rm var/lib/systemd/timesync
-    if [[ -d var/lib/private/systemd/timesync ]]; then
-      mv var/lib/{private/,}systemd/timesync
-    fi
+  if ! grep -qe '^/usr/bin/systemd-home-fallback-shell$' etc/shells; then
+    echo '/usr/bin/systemd-home-fallback-shell' >> etc/shells
   fi
 }
 
@@ -34,7 +29,8 @@ post_install() {
   # enable some services by default, but don't track them
   systemctl enable \
     getty@tty1.service \
-    remote-fs.target
+    remote-fs.target \
+    systemd-userdbd.socket
 
   # group 'systemd-journal-remote' is created by systemd-sysusers
   mkdir -m2755 var/log/journal/remote
@@ -46,10 +42,10 @@ post_upgrade() {
 
   if sd_booted; then
     systemctl --system daemon-reexec
+    systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service'
   fi
 
   local v upgrades=(
-    242.0-2
   )
 
   for v in "${upgrades[@]}"; do
@@ -59,4 +55,8 @@ post_upgrade() {
   done
 }
 
+post_remove() {
+  sed -i -r '/^\/usr\/bin\/systemd-home-fallback-shell$/d' etc/shells
+}
+
 # vim:set ts=2 sw=2 et:
-- 
cgit v1.2.3-70-g09d2