[arch-commits] Commit in systemd/repos/testing-x86_64 (42 files)
Andreas Radke
andyrtr at archlinux.org
Sat Jun 6 19:39:47 UTC 2020
Date: Saturday, June 6, 2020 @ 19:39:05
Author: andyrtr
Revision: 388383
archrelease: copy trunk to testing-x86_64
Added:
systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch
(from rev 388382, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch)
systemd/repos/testing-x86_64/0002-make-homed-userdbd-repart-services-installable.patch
(from rev 388382, systemd/trunk/0002-make-homed-userdbd-repart-services-installable.patch)
systemd/repos/testing-x86_64/20-systemd-sysusers.hook
(from rev 388382, systemd/trunk/20-systemd-sysusers.hook)
systemd/repos/testing-x86_64/30-systemd-binfmt.hook
(from rev 388382, systemd/trunk/30-systemd-binfmt.hook)
systemd/repos/testing-x86_64/30-systemd-catalog.hook
(from rev 388382, systemd/trunk/30-systemd-catalog.hook)
systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook
(from rev 388382, systemd/trunk/30-systemd-daemon-reload.hook)
systemd/repos/testing-x86_64/30-systemd-hwdb.hook
(from rev 388382, systemd/trunk/30-systemd-hwdb.hook)
systemd/repos/testing-x86_64/30-systemd-sysctl.hook
(from rev 388382, systemd/trunk/30-systemd-sysctl.hook)
systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook
(from rev 388382, systemd/trunk/30-systemd-tmpfiles.hook)
systemd/repos/testing-x86_64/30-systemd-udev-reload.hook
(from rev 388382, systemd/trunk/30-systemd-udev-reload.hook)
systemd/repos/testing-x86_64/30-systemd-update.hook
(from rev 388382, systemd/trunk/30-systemd-update.hook)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 388382, systemd/trunk/PKGBUILD)
systemd/repos/testing-x86_64/arch.conf
(from rev 388382, systemd/trunk/arch.conf)
systemd/repos/testing-x86_64/initcpio-hook-udev
(from rev 388382, systemd/trunk/initcpio-hook-udev)
systemd/repos/testing-x86_64/initcpio-install-systemd
(from rev 388382, systemd/trunk/initcpio-install-systemd)
systemd/repos/testing-x86_64/initcpio-install-udev
(from rev 388382, systemd/trunk/initcpio-install-udev)
systemd/repos/testing-x86_64/loader.conf
(from rev 388382, systemd/trunk/loader.conf)
systemd/repos/testing-x86_64/splash-arch.bmp
(from rev 388382, systemd/trunk/splash-arch.bmp)
systemd/repos/testing-x86_64/systemd-hook
(from rev 388382, systemd/trunk/systemd-hook)
systemd/repos/testing-x86_64/systemd-user.pam
(from rev 388382, systemd/trunk/systemd-user.pam)
systemd/repos/testing-x86_64/systemd.install
(from rev 388382, systemd/trunk/systemd.install)
Deleted:
systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch
systemd/repos/testing-x86_64/0002-make-homed-userdbd-repart-services-installable.patch
systemd/repos/testing-x86_64/20-systemd-sysusers.hook
systemd/repos/testing-x86_64/30-systemd-binfmt.hook
systemd/repos/testing-x86_64/30-systemd-catalog.hook
systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook
systemd/repos/testing-x86_64/30-systemd-hwdb.hook
systemd/repos/testing-x86_64/30-systemd-sysctl.hook
systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook
systemd/repos/testing-x86_64/30-systemd-udev-reload.hook
systemd/repos/testing-x86_64/30-systemd-update.hook
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/arch.conf
systemd/repos/testing-x86_64/initcpio-hook-udev
systemd/repos/testing-x86_64/initcpio-install-systemd
systemd/repos/testing-x86_64/initcpio-install-udev
systemd/repos/testing-x86_64/loader.conf
systemd/repos/testing-x86_64/splash-arch.bmp
systemd/repos/testing-x86_64/systemd-hook
systemd/repos/testing-x86_64/systemd-user.pam
systemd/repos/testing-x86_64/systemd.install
-----------------------------------------------------------+
0001-Use-Arch-Linux-device-access-groups.patch | 134 +-
0002-make-homed-userdbd-repart-services-installable.patch | 342 +++---
20-systemd-sysusers.hook | 20
30-systemd-binfmt.hook | 20
30-systemd-catalog.hook | 22
30-systemd-daemon-reload.hook | 22
30-systemd-hwdb.hook | 22
30-systemd-sysctl.hook | 20
30-systemd-tmpfiles.hook | 20
30-systemd-udev-reload.hook | 22
30-systemd-update.hook | 22
PKGBUILD | 588 ++++++------
arch.conf | 14
initcpio-hook-udev | 44
initcpio-install-systemd | 388 +++----
initcpio-install-udev | 58 -
loader.conf | 2
systemd-hook | 74 -
systemd-user.pam | 10
systemd.install | 218 ++--
20 files changed, 1032 insertions(+), 1030 deletions(-)
Deleted: 0001-Use-Arch-Linux-device-access-groups.patch
===================================================================
--- 0001-Use-Arch-Linux-device-access-groups.patch 2020-06-06 19:38:30 UTC (rev 388382)
+++ 0001-Use-Arch-Linux-device-access-groups.patch 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,67 +0,0 @@
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 6 Mar 2018 23:39:47 +0100
-Subject: [PATCH] Use Arch Linux' device access groups
-
- cdrom → optical
- dialout → uucp
- tape → storage
----
- rules.d/50-udev-default.rules.in | 14 +++++++-------
- sysusers.d/basic.conf.in | 6 +++---
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
-index 191f56f42..f81c4d0fc 100644
---- a/rules.d/50-udev-default.rules.in
-+++ b/rules.d/50-udev-default.rules.in
-@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
-
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
-
-@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
-
- SUBSYSTEM=="block", GROUP="disk"
--SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
--SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
--KERNEL=="sch[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
-+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
-+KERNEL=="sch[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd[0-9]*", GROUP="optical"
-+KERNEL=="pktcdvd", GROUP="optical"
-
--SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
-+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
- KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
- KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
-diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
-index 8e358c02d..33e513a36 100644
---- a/sysusers.d/basic.conf.in
-+++ b/sysusers.d/basic.conf.in
-@@ -24,14 +24,14 @@ g utmp - - -
-
- # Hardware access groups
- g audio - - -
--g cdrom - - -
--g dialout - - -
- g disk - - -
- g input - - -
- g kvm - - -
- g lp - - -
-+g optical - - -
- g render - - -
--g tape - - -
-+g storage - - -
-+g uucp - - -
- g video - - -
-
- # Default group for normal users
Copied: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch (from rev 388382, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch)
===================================================================
--- 0001-Use-Arch-Linux-device-access-groups.patch (rev 0)
+++ 0001-Use-Arch-Linux-device-access-groups.patch 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,67 @@
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 6 Mar 2018 23:39:47 +0100
+Subject: [PATCH] Use Arch Linux' device access groups
+
+ cdrom → optical
+ dialout → uucp
+ tape → storage
+---
+ rules.d/50-udev-default.rules.in | 14 +++++++-------
+ sysusers.d/basic.conf.in | 6 +++---
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in
+index 191f56f42..f81c4d0fc 100644
+--- a/rules.d/50-udev-default.rules.in
++++ b/rules.d/50-udev-default.rules.in
+@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
+ SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
+-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
+
+ SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+
+@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
+
+ SUBSYSTEM=="block", GROUP="disk"
+-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
+-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+-KERNEL=="sch[0-9]*", GROUP="cdrom"
+-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
+-KERNEL=="pktcdvd", GROUP="cdrom"
++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"
++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical"
++KERNEL=="sch[0-9]*", GROUP="optical"
++KERNEL=="pktcdvd[0-9]*", GROUP="optical"
++KERNEL=="pktcdvd", GROUP="optical"
+
+-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage"
+ SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
+ KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
+ KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
+diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
+index 8e358c02d..33e513a36 100644
+--- a/sysusers.d/basic.conf.in
++++ b/sysusers.d/basic.conf.in
+@@ -24,14 +24,14 @@ g utmp - - -
+
+ # Hardware access groups
+ g audio - - -
+-g cdrom - - -
+-g dialout - - -
+ g disk - - -
+ g input - - -
+ g kvm - - -
+ g lp - - -
++g optical - - -
+ g render - - -
+-g tape - - -
++g storage - - -
++g uucp - - -
+ g video - - -
+
+ # Default group for normal users
Deleted: 0002-make-homed-userdbd-repart-services-installable.patch
===================================================================
--- 0002-make-homed-userdbd-repart-services-installable.patch 2020-06-06 19:38:30 UTC (rev 388382)
+++ 0002-make-homed-userdbd-repart-services-installable.patch 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,171 +0,0 @@
-From 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
-Date: Fri, 13 Mar 2020 18:33:44 +0100
-Subject: [PATCH 1/3] units: make systemd-repart.service installable
-
-This essentially adds another layer of configurability:
-build disable, this, presence of configuration. The default is
-set to enabled, because the service does nothing w/o config.
----
- presets/90-systemd.preset | 1 +
- units/meson.build | 3 +--
- units/systemd-repart.service.in | 6 +++++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index dc9d02f0b9..7406c92a5c 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -19,6 +19,7 @@ enable getty at .service
- enable systemd-timesyncd.service
- enable systemd-networkd.service
- enable systemd-resolved.service
-+enable systemd-repart.service
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index ea91f0cc9e..9964eb79a4 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -228,8 +228,7 @@ in_units = [
- 'multi-user.target.wants/'],
- ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
- ['systemd-volatile-root.service', ''],
-- ['systemd-repart.service', 'ENABLE_REPART',
-- 'sysinit.target.wants/ initrd-root-fs.target.wants/'],
-+ ['systemd-repart.service', 'ENABLE_REPART'],
- ['user-runtime-dir at .service', ''],
- ['user at .service', ''],
- ]
-diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
-index 7ce6aefd29..41a9d82b93 100644
---- a/units/systemd-repart.service.in
-+++ b/units/systemd-repart.service.in
-@@ -21,5 +21,9 @@ Type=oneshot
- RemainAfterExit=yes
- ExecStart=@rootbindir@/systemd-repart --dry-run=no
-
--# The tool returns 77 if there's no GPT partition table pre-existing
-+# The tool returns 77 if there's no existing GPT partition table
- SuccessExitStatus=77
-+
-+[Install]
-+WantedBy=sysinit.target
-+WantedBy=initrd-root-fs.target
-From 5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
-Date: Fri, 13 Mar 2020 18:38:09 +0100
-Subject: [PATCH 2/3] units: make systemd-homed.service installable
-
-Fixes #15083. Users might want to disable homed if not used to save resources.
----
- presets/90-systemd.preset | 1 +
- test/units/testsuite-46.service | 4 +++-
- units/meson.build | 3 +--
- units/systemd-homed.service.in | 4 ++++
- 4 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index 7406c92a5c..53eb8a7806 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -20,6 +20,7 @@ enable systemd-timesyncd.service
- enable systemd-networkd.service
- enable systemd-resolved.service
- enable systemd-repart.service
-+enable systemd-homed.service
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index 9964eb79a4..d8ee6df184 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -201,8 +201,7 @@ in_units = [
- ['systemd-portabled.service', 'ENABLE_PORTABLED',
- 'dbus-org.freedesktop.portable1.service'],
- ['systemd-userdbd.service', 'ENABLE_USERDB'],
-- ['systemd-homed.service', 'ENABLE_HOMED',
-- 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'],
-+ ['systemd-homed.service', 'ENABLE_HOMED'],
- ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'],
- ['systemd-random-seed.service', 'ENABLE_RANDOMSEED',
- 'sysinit.target.wants/'],
-diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
-index 7cf98e6fa6..8138f5125c 100644
---- a/units/systemd-homed.service.in
-+++ b/units/systemd-homed.service.in
-@@ -34,3 +34,7 @@ SystemCallArchitectures=native
- SystemCallErrorNumber=EPERM
- SystemCallFilter=@system-service @mount
- @SERVICE_WATCHDOG@
-+
-+[Install]
-+WantedBy=multi-user.target
-+Alias=dbus-org.freedesktop.home1.service
-From ead7af30939e3f1903455c7e06bc7cfeef54d4a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
-Date: Fri, 13 Mar 2020 18:40:54 +0100
-Subject: [PATCH 3/3] units: make systemd-userdbd.{socket,service} installable
-
-It's lightweight and generally useful, so it should be enabled by default. But
-users might want to disable it for whatever reason, and things should be fine
-without it, so let's make it installable so it can be disabled if wanted.
-
-Fixes #15175.
----
- presets/90-systemd.preset | 1 +
- units/meson.build | 3 +--
- units/systemd-userdbd.service.in | 3 +++
- units/systemd-userdbd.socket | 3 +++
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
-index 53eb8a7806..db61ef12d3 100644
---- a/presets/90-systemd.preset
-+++ b/presets/90-systemd.preset
-@@ -21,6 +21,7 @@ enable systemd-networkd.service
- enable systemd-resolved.service
- enable systemd-repart.service
- enable systemd-homed.service
-+enable systemd-userdbd.socket
-
- disable console-getty.service
- disable debug-shell.service
-diff --git a/units/meson.build b/units/meson.build
-index d8ee6df184..8ec9eb94e4 100644
---- a/units/meson.build
-+++ b/units/meson.build
-@@ -139,8 +139,7 @@ units = [
- 'sysinit.target.wants/'],
- ['systemd-udevd-kernel.socket', '',
- 'sockets.target.wants/'],
-- ['systemd-userdbd.socket', 'ENABLE_USERDB',
-- 'sockets.target.wants/'],
-+ ['systemd-userdbd.socket', 'ENABLE_USERDB'],
- ['time-set.target', ''],
- ['time-sync.target', ''],
- ['timers.target', ''],
-diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
-index e30ed2109e..3b76705373 100644
---- a/units/systemd-userdbd.service.in
-+++ b/units/systemd-userdbd.service.in
-@@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM
- SystemCallFilter=@system-service
- Type=notify
- @SERVICE_WATCHDOG@
-+
-+[Install]
-+Also=systemd-userdbd.socket
-diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
-index 1c749ea1d2..2b4bb7a87a 100644
---- a/units/systemd-userdbd.socket
-+++ b/units/systemd-userdbd.socket
-@@ -17,3 +17,6 @@ Before=sockets.target
- ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
- Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch
- SocketMode=0666
-+
-+[Install]
-+WantedBy=sockets.target
Copied: systemd/repos/testing-x86_64/0002-make-homed-userdbd-repart-services-installable.patch (from rev 388382, systemd/trunk/0002-make-homed-userdbd-repart-services-installable.patch)
===================================================================
--- 0002-make-homed-userdbd-repart-services-installable.patch (rev 0)
+++ 0002-make-homed-userdbd-repart-services-installable.patch 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,171 @@
+From 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Fri, 13 Mar 2020 18:33:44 +0100
+Subject: [PATCH 1/3] units: make systemd-repart.service installable
+
+This essentially adds another layer of configurability:
+build disable, this, presence of configuration. The default is
+set to enabled, because the service does nothing w/o config.
+---
+ presets/90-systemd.preset | 1 +
+ units/meson.build | 3 +--
+ units/systemd-repart.service.in | 6 +++++-
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
+index dc9d02f0b9..7406c92a5c 100644
+--- a/presets/90-systemd.preset
++++ b/presets/90-systemd.preset
+@@ -19,6 +19,7 @@ enable getty at .service
+ enable systemd-timesyncd.service
+ enable systemd-networkd.service
+ enable systemd-resolved.service
++enable systemd-repart.service
+
+ disable console-getty.service
+ disable debug-shell.service
+diff --git a/units/meson.build b/units/meson.build
+index ea91f0cc9e..9964eb79a4 100644
+--- a/units/meson.build
++++ b/units/meson.build
+@@ -228,8 +228,7 @@ in_units = [
+ 'multi-user.target.wants/'],
+ ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'],
+ ['systemd-volatile-root.service', ''],
+- ['systemd-repart.service', 'ENABLE_REPART',
+- 'sysinit.target.wants/ initrd-root-fs.target.wants/'],
++ ['systemd-repart.service', 'ENABLE_REPART'],
+ ['user-runtime-dir at .service', ''],
+ ['user at .service', ''],
+ ]
+diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in
+index 7ce6aefd29..41a9d82b93 100644
+--- a/units/systemd-repart.service.in
++++ b/units/systemd-repart.service.in
+@@ -21,5 +21,9 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootbindir@/systemd-repart --dry-run=no
+
+-# The tool returns 77 if there's no GPT partition table pre-existing
++# The tool returns 77 if there's no existing GPT partition table
+ SuccessExitStatus=77
++
++[Install]
++WantedBy=sysinit.target
++WantedBy=initrd-root-fs.target
+From 5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Fri, 13 Mar 2020 18:38:09 +0100
+Subject: [PATCH 2/3] units: make systemd-homed.service installable
+
+Fixes #15083. Users might want to disable homed if not used to save resources.
+---
+ presets/90-systemd.preset | 1 +
+ test/units/testsuite-46.service | 4 +++-
+ units/meson.build | 3 +--
+ units/systemd-homed.service.in | 4 ++++
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
+index 7406c92a5c..53eb8a7806 100644
+--- a/presets/90-systemd.preset
++++ b/presets/90-systemd.preset
+@@ -20,6 +20,7 @@ enable systemd-timesyncd.service
+ enable systemd-networkd.service
+ enable systemd-resolved.service
+ enable systemd-repart.service
++enable systemd-homed.service
+
+ disable console-getty.service
+ disable debug-shell.service
+diff --git a/units/meson.build b/units/meson.build
+index 9964eb79a4..d8ee6df184 100644
+--- a/units/meson.build
++++ b/units/meson.build
+@@ -201,8 +201,7 @@ in_units = [
+ ['systemd-portabled.service', 'ENABLE_PORTABLED',
+ 'dbus-org.freedesktop.portable1.service'],
+ ['systemd-userdbd.service', 'ENABLE_USERDB'],
+- ['systemd-homed.service', 'ENABLE_HOMED',
+- 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'],
++ ['systemd-homed.service', 'ENABLE_HOMED'],
+ ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'],
+ ['systemd-random-seed.service', 'ENABLE_RANDOMSEED',
+ 'sysinit.target.wants/'],
+diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in
+index 7cf98e6fa6..8138f5125c 100644
+--- a/units/systemd-homed.service.in
++++ b/units/systemd-homed.service.in
+@@ -34,3 +34,7 @@ SystemCallArchitectures=native
+ SystemCallErrorNumber=EPERM
+ SystemCallFilter=@system-service @mount
+ @SERVICE_WATCHDOG@
++
++[Install]
++WantedBy=multi-user.target
++Alias=dbus-org.freedesktop.home1.service
+From ead7af30939e3f1903455c7e06bc7cfeef54d4a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Fri, 13 Mar 2020 18:40:54 +0100
+Subject: [PATCH 3/3] units: make systemd-userdbd.{socket,service} installable
+
+It's lightweight and generally useful, so it should be enabled by default. But
+users might want to disable it for whatever reason, and things should be fine
+without it, so let's make it installable so it can be disabled if wanted.
+
+Fixes #15175.
+---
+ presets/90-systemd.preset | 1 +
+ units/meson.build | 3 +--
+ units/systemd-userdbd.service.in | 3 +++
+ units/systemd-userdbd.socket | 3 +++
+ 4 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset
+index 53eb8a7806..db61ef12d3 100644
+--- a/presets/90-systemd.preset
++++ b/presets/90-systemd.preset
+@@ -21,6 +21,7 @@ enable systemd-networkd.service
+ enable systemd-resolved.service
+ enable systemd-repart.service
+ enable systemd-homed.service
++enable systemd-userdbd.socket
+
+ disable console-getty.service
+ disable debug-shell.service
+diff --git a/units/meson.build b/units/meson.build
+index d8ee6df184..8ec9eb94e4 100644
+--- a/units/meson.build
++++ b/units/meson.build
+@@ -139,8 +139,7 @@ units = [
+ 'sysinit.target.wants/'],
+ ['systemd-udevd-kernel.socket', '',
+ 'sockets.target.wants/'],
+- ['systemd-userdbd.socket', 'ENABLE_USERDB',
+- 'sockets.target.wants/'],
++ ['systemd-userdbd.socket', 'ENABLE_USERDB'],
+ ['time-set.target', ''],
+ ['time-sync.target', ''],
+ ['timers.target', ''],
+diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
+index e30ed2109e..3b76705373 100644
+--- a/units/systemd-userdbd.service.in
++++ b/units/systemd-userdbd.service.in
+@@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM
+ SystemCallFilter=@system-service
+ Type=notify
+ @SERVICE_WATCHDOG@
++
++[Install]
++Also=systemd-userdbd.socket
+diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
+index 1c749ea1d2..2b4bb7a87a 100644
+--- a/units/systemd-userdbd.socket
++++ b/units/systemd-userdbd.socket
+@@ -17,3 +17,6 @@ Before=sockets.target
+ ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
+ Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch
+ SocketMode=0666
++
++[Install]
++WantedBy=sockets.target
Deleted: 20-systemd-sysusers.hook
===================================================================
--- 20-systemd-sysusers.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 20-systemd-sysusers.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,10 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Creating system user accounts...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
Copied: systemd/repos/testing-x86_64/20-systemd-sysusers.hook (from rev 388382, systemd/trunk/20-systemd-sysusers.hook)
===================================================================
--- 20-systemd-sysusers.hook (rev 0)
+++ 20-systemd-sysusers.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Creating system user accounts...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysusers
Deleted: 30-systemd-binfmt.hook
===================================================================
--- 30-systemd-binfmt.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-binfmt.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,10 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/binfmt.d/*.conf
-
-[Action]
-Description = Registering binary formats...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
Copied: systemd/repos/testing-x86_64/30-systemd-binfmt.hook (from rev 388382, systemd/trunk/30-systemd-binfmt.hook)
===================================================================
--- 30-systemd-binfmt.hook (rev 0)
+++ 30-systemd-binfmt.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/binfmt.d/*.conf
+
+[Action]
+Description = Registering binary formats...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook binfmt
Deleted: 30-systemd-catalog.hook
===================================================================
--- 30-systemd-catalog.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-catalog.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/systemd/catalog/*
-
-[Action]
-Description = Updating journal message catalog...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook catalog
Copied: systemd/repos/testing-x86_64/30-systemd-catalog.hook (from rev 388382, systemd/trunk/30-systemd-catalog.hook)
===================================================================
--- 30-systemd-catalog.hook (rev 0)
+++ 30-systemd-catalog.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/catalog/*
+
+[Action]
+Description = Updating journal message catalog...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook catalog
Deleted: 30-systemd-daemon-reload.hook
===================================================================
--- 30-systemd-daemon-reload.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-daemon-reload.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/systemd/system/*
-
-[Action]
-Description = Reloading system manager configuration...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
Copied: systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook (from rev 388382, systemd/trunk/30-systemd-daemon-reload.hook)
===================================================================
--- 30-systemd-daemon-reload.hook (rev 0)
+++ 30-systemd-daemon-reload.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/systemd/system/*
+
+[Action]
+Description = Reloading system manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload
Deleted: 30-systemd-hwdb.hook
===================================================================
--- 30-systemd-hwdb.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-hwdb.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/udev/hwdb.d/*
-
-[Action]
-Description = Updating udev hardware database...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook hwdb
Copied: systemd/repos/testing-x86_64/30-systemd-hwdb.hook (from rev 388382, systemd/trunk/30-systemd-hwdb.hook)
===================================================================
--- 30-systemd-hwdb.hook (rev 0)
+++ 30-systemd-hwdb.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/hwdb.d/*
+
+[Action]
+Description = Updating udev hardware database...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook hwdb
Deleted: 30-systemd-sysctl.hook
===================================================================
--- 30-systemd-sysctl.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-sysctl.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,10 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysctl.d/*.conf
-
-[Action]
-Description = Applying kernel sysctl settings...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
Copied: systemd/repos/testing-x86_64/30-systemd-sysctl.hook (from rev 388382, systemd/trunk/30-systemd-sysctl.hook)
===================================================================
--- 30-systemd-sysctl.hook (rev 0)
+++ 30-systemd-sysctl.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysctl.d/*.conf
+
+[Action]
+Description = Applying kernel sysctl settings...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook sysctl
Deleted: 30-systemd-tmpfiles.hook
===================================================================
--- 30-systemd-tmpfiles.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-tmpfiles.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,10 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/tmpfiles.d/*.conf
-
-[Action]
-Description = Creating temporary files...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
Copied: systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook (from rev 388382, systemd/trunk/30-systemd-tmpfiles.hook)
===================================================================
--- 30-systemd-tmpfiles.hook (rev 0)
+++ 30-systemd-tmpfiles.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/tmpfiles.d/*.conf
+
+[Action]
+Description = Creating temporary files...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles
Deleted: 30-systemd-udev-reload.hook
===================================================================
--- 30-systemd-udev-reload.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-udev-reload.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/udev/rules.d/*
-
-[Action]
-Description = Reloading device manager configuration...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload
Copied: systemd/repos/testing-x86_64/30-systemd-udev-reload.hook (from rev 388382, systemd/trunk/30-systemd-udev-reload.hook)
===================================================================
--- 30-systemd-udev-reload.hook (rev 0)
+++ 30-systemd-udev-reload.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/rules.d/*
+
+[Action]
+Description = Reloading device manager configuration...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload
Deleted: 30-systemd-update.hook
===================================================================
--- 30-systemd-update.hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ 30-systemd-update.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/
-
-[Action]
-Description = Arming ConditionNeedsUpdate...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/systemd-hook update
Copied: systemd/repos/testing-x86_64/30-systemd-update.hook (from rev 388382, systemd/trunk/30-systemd-update.hook)
===================================================================
--- 30-systemd-update.hook (rev 0)
+++ 30-systemd-update.hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/
+
+[Action]
+Description = Arming ConditionNeedsUpdate...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/systemd-hook update
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-06 19:38:30 UTC (rev 388382)
+++ PKGBUILD 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,293 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Maintainer: Tom Gundersen <teg at jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
-_tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver}
-pkgver=245.6
-pkgrel=3
-arch=('x86_64')
-url='https://www.github.com/systemd/systemd'
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
- 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
- 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
- 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
- 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
- 'bash-completion' 'p11-kit' 'systemd')
-options=('strip')
-validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart at poettering.net>
- '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
-source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
- "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
- '0001-Use-Arch-Linux-device-access-groups.patch'
- '0002-make-homed-userdbd-repart-services-installable.patch'
- 'initcpio-hook-udev'
- 'initcpio-install-systemd'
- 'initcpio-install-udev'
- 'arch.conf'
- 'loader.conf'
- 'splash-arch.bmp'
- 'systemd-user.pam'
- 'systemd-hook'
- '20-systemd-sysusers.hook'
- '30-systemd-binfmt.hook'
- '30-systemd-catalog.hook'
- '30-systemd-daemon-reload.hook'
- '30-systemd-hwdb.hook'
- '30-systemd-sysctl.hook'
- '30-systemd-tmpfiles.hook'
- '30-systemd-udev-reload.hook'
- '30-systemd-update.hook')
-sha512sums=('SKIP'
- 'SKIP'
- 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
- '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
- 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
- 'e5dfc897f281dcfa89dc81b4f24a4098a49b190bff49cea313c20d4ad019e8ebbe07cbe84232bae0579d103bc66ce96d098e0dbd0a93efd19d249ac742060038'
- 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
- '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
- 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
- '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
- 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
- '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
- '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
- '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
- '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
- '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
- 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
- '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
- 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
- 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3'
- '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
-
-_backports=(
- # systemd-resolved: use hostname for certificate validation in DoT
- 'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5'
-
- # unregister binary formats during shutdown #15566
- # shared: add common helper for unregistering all binfmt entries
- '965cc99416a3b5a2a71127e9e6d2e4a95ab3c432'
- # shutdown: unregister all binfmt_misc entries before entering shutdown loop
- '0282c0285a3e3c2e409305ce28555a6ad0489539'
- # binfmt: modernize code a bit
- 'f3670df13e144c2f81bf6f9a0bea581e6d555bdd'
- # binfmt: also unregister binfmt entries from unit
- '846acb6798a63f35162f58e1146d1a1f40849e86'
- # man: document binfmt's new --unregister switch
- 'cd9aa8f0f91b113acb079e79750c146c0529c2d7'
-
- # sd-journal: don't check namespaces if we have no namespace to go by
- '2b6df46d21abe8a8b7481e420588a9a129699cf9'
-
- # network: tc: support Hierarchy Token Bucket (HTB)
- # (we need this for safe_atou32_full()...)
- 'b934ac3d6e7dcad114776ef30ee9098693e7ab7e'
- # basic/user-util: always use base 10 for user/group numbers
- '156a5fd297b61bce31630d7a52c15614bf784843'
-)
-
-_reverts=(
-)
-
-prepare() {
- cd "$pkgbase-stable"
-
- # add upstream repository for cherry-picking
- git remote add -f upstream ../systemd
-
- local _c
- for _c in "${_backports[@]}"; do
- git log --oneline -1 "${_c}"
- git cherry-pick -n "${_c}"
- done
- for _c in "${_reverts[@]}"; do
- git log --oneline -1 "${_c}"
- git revert -n "${_c}"
- done
-
- # Replace cdrom/dialout/tape groups with optical/uucp/storage
- patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
-
- # Make homed/userdbd/repart services installable (to allow uninstalling)
- patch -Np1 -i ../0002-make-homed-userdbd-repart-services-installable.patch
-}
-
-build() {
- local _timeservers=({0..3}.arch.pool.ntp.org)
- local _nameservers=(
- # We use these public name services, ordered by their
- # privacy policy (hopefully):
- # * Cloudflare (https://1.1.1.1/)
- # * Quad9 without filtering (https://www.quad9.net/)
- # * Google (https://developers.google.com/speed/public-dns/)
- 1.1.1.1
- 9.9.9.10
- 8.8.8.8
- 2606:4700:4700::1111
- 2620:fe::10
- 2001:4860:4860::8888
- )
-
- local _meson_options=(
- -Dversion-tag="${pkgver}-${pkgrel}-arch"
-
- -Dgnu-efi=true
- -Dima=false
- -Dlibidn2=true
- -Dlz4=true
- -Dman=true
-
- -Ddbuspolicydir=/usr/share/dbus-1/system.d
- -Ddefault-hierarchy=hybrid
- -Ddefault-kill-user-processes=false
- -Ddefault-locale=C
- -Dfallback-hostname='archlinux'
- -Dnologin-path=/usr/bin/nologin
- -Dntp-servers="${_timeservers[*]}"
- -Ddns-servers="${_nameservers[*]}"
- -Drpmmacrosdir=no
- -Dsysvinit-path=
- -Dsysvrcnd-path=
- )
-
- arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
-
- ninja -C build
-}
-
-check() {
- meson test -C build
-}
-
-package_systemd() {
- pkgdesc='system and service manager'
- license=('GPL2' 'LGPL2.1')
- depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
- 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
- 'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam'
- 'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
- 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
- 'libp11-kit.so')
- provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
- replaces=('nss-myhostname' 'systemd-tools' 'udev')
- conflicts=('nss-myhostname' 'systemd-tools' 'udev')
- optdepends=('libmicrohttpd: remote journald capabilities'
- 'quota-tools: kernel-level quota management'
- 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'polkit: allow administration as unprivileged user'
- 'curl: machinectl pull-tar and pull-raw')
- backup=(etc/pam.d/systemd-user
- etc/systemd/coredump.conf
- etc/systemd/journald.conf
- etc/systemd/journal-remote.conf
- etc/systemd/journal-upload.conf
- etc/systemd/logind.conf
- etc/systemd/networkd.conf
- etc/systemd/resolved.conf
- etc/systemd/sleep.conf
- etc/systemd/system.conf
- etc/systemd/timesyncd.conf
- etc/systemd/user.conf
- etc/udev/udev.conf)
- install=systemd.install
-
- DESTDIR="$pkgdir" meson install -C build
-
- # we'll create this on installation
- rmdir "$pkgdir"/var/log/journal/remote
-
- # runtime libraries shipped with systemd-libs
- install -d -m0755 systemd-libs
- mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
-
- # manpages shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
-
- # executable (symlinks) shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
-
- # files shipped with systemd-resolvconf
- rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
-
- # avoid a potential conflict with [core]/filesystem
- rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
- sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
- -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
-
- # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
- install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
-
- # ship default policy to leave services disabled
- echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
-
- # add mkinitcpio hooks
- install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
- install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
- install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
-
- # ensure proper permissions for /var/log/journal
- # The permissions are stored with named group by tar, so this works with
- # users and groups populated by systemd-sysusers. This is only to prevent a
- # warning from pacman as permissions are set by systemd-tmpfiles anyway.
- install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal
-
- # match directory owner/group and mode from [extra]/polkit
- install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d
-
- # add example bootctl configuration
- install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf
- install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
- install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
-
- # pacman hooks
- install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook
- install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook
-
- # overwrite the systemd-user PAM configuration with our own
- install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
-}
-
-package_systemd-libs() {
- pkgdesc='systemd client libraries'
- depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
- license=('LGPL2.1')
- provides=('libsystemd' 'libsystemd.so' 'libudev.so')
- conflicts=('libsystemd')
- replaces=('libsystemd')
-
- install -d -m0755 "$pkgdir"/usr
- mv systemd-libs "$pkgdir"/usr/lib
-}
-
-package_systemd-resolvconf() {
- pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
- license=('LGPL2.1')
- depends=('systemd')
- provides=('openresolv' 'resolvconf')
- conflicts=('openresolv')
-
- install -d -m0755 "$pkgdir"/usr/bin
- ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
-
- install -d -m0755 "$pkgdir"/usr/share/man/man1
- ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
-}
-
-package_systemd-sysvcompat() {
- pkgdesc='sysvinit compat for systemd'
- license=('GPL2')
- conflicts=('sysvinit')
- depends=('systemd')
-
- install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
- build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-
- install -d -m0755 "$pkgdir"/usr/bin
- ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
- for tool in runlevel reboot shutdown poweroff halt telinit; do
- ln -s systemctl "$pkgdir"/usr/bin/$tool
- done
-}
-
-# vim:ft=sh syn=sh et sw=2:
Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 388382, systemd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,295 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
+_tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver}
+pkgver=245.6
+pkgrel=4
+arch=('x86_64')
+url='https://www.github.com/systemd/systemd'
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
+ 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
+ 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+ 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+ 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
+ 'bash-completion' 'p11-kit' 'systemd')
+options=('strip')
+validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart at poettering.net>
+ '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
+source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
+ "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
+ '0001-Use-Arch-Linux-device-access-groups.patch'
+ '0002-make-homed-userdbd-repart-services-installable.patch'
+ 'initcpio-hook-udev'
+ 'initcpio-install-systemd'
+ 'initcpio-install-udev'
+ 'arch.conf'
+ 'loader.conf'
+ 'splash-arch.bmp'
+ 'systemd-user.pam'
+ 'systemd-hook'
+ '20-systemd-sysusers.hook'
+ '30-systemd-binfmt.hook'
+ '30-systemd-catalog.hook'
+ '30-systemd-daemon-reload.hook'
+ '30-systemd-hwdb.hook'
+ '30-systemd-sysctl.hook'
+ '30-systemd-tmpfiles.hook'
+ '30-systemd-udev-reload.hook'
+ '30-systemd-update.hook')
+sha512sums=('SKIP'
+ 'SKIP'
+ 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
+ '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
+ 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
+ 'e5dfc897f281dcfa89dc81b4f24a4098a49b190bff49cea313c20d4ad019e8ebbe07cbe84232bae0579d103bc66ce96d098e0dbd0a93efd19d249ac742060038'
+ 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
+ '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
+ 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
+ '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
+ 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
+ '869dab2b1837c964add4019bb402e24e52dbb7f009850ca69fcc5deddd923eeb98eb8ee38601f6e31531f30322472fe7df09af84df27f0467708406c55885323'
+ '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
+ '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
+ '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
+ '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
+ 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154'
+ '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
+ 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
+ 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3'
+ '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
+
+_backports=(
+ # systemd-resolved: use hostname for certificate validation in DoT
+ 'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5'
+
+ # unregister binary formats during shutdown #15566
+ # shared: add common helper for unregistering all binfmt entries
+ '965cc99416a3b5a2a71127e9e6d2e4a95ab3c432'
+ # shutdown: unregister all binfmt_misc entries before entering shutdown loop
+ '0282c0285a3e3c2e409305ce28555a6ad0489539'
+ # binfmt: modernize code a bit
+ 'f3670df13e144c2f81bf6f9a0bea581e6d555bdd'
+ # binfmt: also unregister binfmt entries from unit
+ '846acb6798a63f35162f58e1146d1a1f40849e86'
+ # man: document binfmt's new --unregister switch
+ 'cd9aa8f0f91b113acb079e79750c146c0529c2d7'
+
+ # sd-journal: don't check namespaces if we have no namespace to go by
+ '2b6df46d21abe8a8b7481e420588a9a129699cf9'
+
+ # network: tc: support Hierarchy Token Bucket (HTB)
+ # (we need this for safe_atou32_full()...)
+ 'b934ac3d6e7dcad114776ef30ee9098693e7ab7e'
+ # basic/user-util: always use base 10 for user/group numbers
+ '156a5fd297b61bce31630d7a52c15614bf784843'
+)
+
+_reverts=(
+ # introduces ordering cycle - FS#66908
+ 'e1c091b6d4c55de5c5356e8ca5564dba6769b49f'
+)
+
+prepare() {
+ cd "$pkgbase-stable"
+
+ # add upstream repository for cherry-picking
+ git remote add -f upstream ../systemd
+
+ local _c
+ for _c in "${_backports[@]}"; do
+ git log --oneline -1 "${_c}"
+ git cherry-pick -n "${_c}"
+ done
+ for _c in "${_reverts[@]}"; do
+ git log --oneline -1 "${_c}"
+ git revert -n "${_c}"
+ done
+
+ # Replace cdrom/dialout/tape groups with optical/uucp/storage
+ patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
+
+ # Make homed/userdbd/repart services installable (to allow uninstalling)
+ patch -Np1 -i ../0002-make-homed-userdbd-repart-services-installable.patch
+}
+
+build() {
+ local _timeservers=({0..3}.arch.pool.ntp.org)
+ local _nameservers=(
+ # We use these public name services, ordered by their
+ # privacy policy (hopefully):
+ # * Cloudflare (https://1.1.1.1/)
+ # * Quad9 without filtering (https://www.quad9.net/)
+ # * Google (https://developers.google.com/speed/public-dns/)
+ 1.1.1.1
+ 9.9.9.10
+ 8.8.8.8
+ 2606:4700:4700::1111
+ 2620:fe::10
+ 2001:4860:4860::8888
+ )
+
+ local _meson_options=(
+ -Dversion-tag="${pkgver}-${pkgrel}-arch"
+
+ -Dgnu-efi=true
+ -Dima=false
+ -Dlibidn2=true
+ -Dlz4=true
+ -Dman=true
+
+ -Ddbuspolicydir=/usr/share/dbus-1/system.d
+ -Ddefault-hierarchy=hybrid
+ -Ddefault-kill-user-processes=false
+ -Ddefault-locale=C
+ -Dfallback-hostname='archlinux'
+ -Dnologin-path=/usr/bin/nologin
+ -Dntp-servers="${_timeservers[*]}"
+ -Ddns-servers="${_nameservers[*]}"
+ -Drpmmacrosdir=no
+ -Dsysvinit-path=
+ -Dsysvrcnd-path=
+ )
+
+ arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
+
+ ninja -C build
+}
+
+check() {
+ meson test -C build
+}
+
+package_systemd() {
+ pkgdesc='system and service manager'
+ license=('GPL2' 'LGPL2.1')
+ depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
+ 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
+ 'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam'
+ 'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so'
+ 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit'
+ 'libp11-kit.so')
+ provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+ replaces=('nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('nss-myhostname' 'systemd-tools' 'udev')
+ optdepends=('libmicrohttpd: remote journald capabilities'
+ 'quota-tools: kernel-level quota management'
+ 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+ 'polkit: allow administration as unprivileged user'
+ 'curl: machinectl pull-tar and pull-raw')
+ backup=(etc/pam.d/systemd-user
+ etc/systemd/coredump.conf
+ etc/systemd/journald.conf
+ etc/systemd/journal-remote.conf
+ etc/systemd/journal-upload.conf
+ etc/systemd/logind.conf
+ etc/systemd/networkd.conf
+ etc/systemd/resolved.conf
+ etc/systemd/sleep.conf
+ etc/systemd/system.conf
+ etc/systemd/timesyncd.conf
+ etc/systemd/user.conf
+ etc/udev/udev.conf)
+ install=systemd.install
+
+ DESTDIR="$pkgdir" meson install -C build
+
+ # we'll create this on installation
+ rmdir "$pkgdir"/var/log/journal/remote
+
+ # runtime libraries shipped with systemd-libs
+ install -d -m0755 systemd-libs
+ mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs
+
+ # manpages shipped with systemd-sysvcompat
+ rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
+
+ # executable (symlinks) shipped with systemd-sysvcompat
+ rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+
+ # files shipped with systemd-resolvconf
+ rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
+
+ # avoid a potential conflict with [core]/filesystem
+ rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf}
+ sed -i -e '/^C \/etc\/nsswitch\.conf/d' \
+ -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+
+ # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
+ install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d
+
+ # ship default policy to leave services disabled
+ echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
+
+ # add mkinitcpio hooks
+ install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
+ install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev
+ install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev
+
+ # ensure proper permissions for /var/log/journal
+ # The permissions are stored with named group by tar, so this works with
+ # users and groups populated by systemd-sysusers. This is only to prevent a
+ # warning from pacman as permissions are set by systemd-tmpfiles anyway.
+ install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal
+
+ # match directory owner/group and mode from [extra]/polkit
+ install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d
+
+ # add example bootctl configuration
+ install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf
+ install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf
+ install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
+
+ # pacman hooks
+ install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook
+ install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook
+
+ # overwrite the systemd-user PAM configuration with our own
+ install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user
+}
+
+package_systemd-libs() {
+ pkgdesc='systemd client libraries'
+ depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+ license=('LGPL2.1')
+ provides=('libsystemd' 'libsystemd.so' 'libudev.so')
+ conflicts=('libsystemd')
+ replaces=('libsystemd')
+
+ install -d -m0755 "$pkgdir"/usr
+ mv systemd-libs "$pkgdir"/usr/lib
+}
+
+package_systemd-resolvconf() {
+ pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
+ license=('LGPL2.1')
+ depends=('systemd')
+ provides=('openresolv' 'resolvconf')
+ conflicts=('openresolv')
+
+ install -d -m0755 "$pkgdir"/usr/bin
+ ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
+
+ install -d -m0755 "$pkgdir"/usr/share/man/man1
+ ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
+}
+
+package_systemd-sysvcompat() {
+ pkgdesc='sysvinit compat for systemd'
+ license=('GPL2')
+ conflicts=('sysvinit')
+ depends=('systemd')
+
+ install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
+ build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+ install -d -m0755 "$pkgdir"/usr/bin
+ ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init
+ for tool in runlevel reboot shutdown poweroff halt telinit; do
+ ln -s systemctl "$pkgdir"/usr/bin/$tool
+ done
+}
+
+# vim:ft=sh syn=sh et sw=2:
Deleted: arch.conf
===================================================================
--- arch.conf 2020-06-06 19:38:30 UTC (rev 388382)
+++ arch.conf 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title Arch Linux
-linux /vmlinuz-linux
-initrd /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Copied: systemd/repos/testing-x86_64/arch.conf (from rev 388382, systemd/trunk/arch.conf)
===================================================================
--- arch.conf (rev 0)
+++ arch.conf 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,7 @@
+## This is just an example config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title Arch Linux
+linux /vmlinuz-linux
+initrd /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
Deleted: initcpio-hook-udev
===================================================================
--- initcpio-hook-udev 2020-06-06 19:38:30 UTC (rev 388382)
+++ initcpio-hook-udev 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,22 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
- systemd-tmpfiles --prefix=/dev --create --boot
- /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 388382, systemd/trunk/initcpio-hook-udev)
===================================================================
--- initcpio-hook-udev (rev 0)
+++ initcpio-hook-udev 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,22 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+ kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+ systemd-tmpfiles --prefix=/dev --create --boot
+ /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+ udevd_running=1
+}
+
+run_hook() {
+ msg ":: Triggering uevents..."
+ udevadm trigger --action=add --type=subsystems
+ udevadm trigger --action=add --type=devices
+ udevadm settle
+}
+
+run_cleanuphook() {
+ udevadm control --exit
+ udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd 2020-06-06 19:38:30 UTC (rev 388382)
+++ initcpio-install-systemd 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,194 +0,0 @@
-#!/bin/bash
-
-strip_quotes() {
- local len=${#1} quotes=$'[\'"]' str=${!1}
-
- if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
- printf -v "$1" %s "${str:1:-1}"
- fi
-}
-
-add_udev_rule() {
- # Add an udev rules file to the initcpio image. Dependencies on binaries
- # will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local rules= rule= key= value= binary=
-
- rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
- if [[ -z $rules ]]; then
- # complain about not found rules
- return 1
- fi
-
- add_file "$rules"
-
- while IFS=, read -ra rule; do
- # skip empty lines, comments
- [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
- for pair in "${rule[@]}"; do
- IFS=' =' read -r key value <<< "$pair"
- case $key in
- RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
- strip_quotes 'value'
- # just take the first word as the binary name
- binary=${value%% *}
- [[ ${binary:0:1} == '$' ]] && continue
- if [[ ${binary:0:1} != '/' ]]; then
- binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
- fi
- add_binary "$binary"
- ;;
- esac
- done
- done <"$rules"
-}
-
-add_systemd_unit() {
- # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
- # and other unit files will be discovered and added.
- # $1: path to rules file (or name of rules file)
-
- local unit= rule= entry= key= value= binary= dep=
-
- unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
- if [[ -z $unit ]]; then
- # complain about not found unit file
- return 1
- fi
-
- add_file "$unit"
-
- while IFS='=' read -r key values; do
- read -ra values <<< "$values"
-
- case $key in
- Requires|OnFailure)
- # only add hard dependencies (not Wants)
- map add_systemd_unit "${values[@]}"
- ;;
- Exec*)
- # don't add binaries unless they are required
- if [[ ${values[0]:0:1} != '-' ]]; then
- add_binary "${values[0]}"
- fi
- ;;
- esac
-
- done <"$unit"
-
- # preserve reverse soft dependency
- for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
- if [[ -L $dep ]]; then
- add_symlink "$dep"
- fi
- done
-
- # add hard dependencies
- if [[ -d $unit.requires ]]; then
- for dep in "$unit".requires/*; do
- add_systemd_unit ${dep##*/}
- done
- fi
-}
-
-add_systemd_drop_in() {
- local unit=$1 dropin_name=$2
-
- mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
- cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
- local rules unit
-
- # from base
- add_binary /bin/mount
- add_binary /usr/bin/kmod /usr/bin/modprobe
- add_binary /usr/lib/systemd/systemd /init
- add_binary /usr/bin/sulogin
-
- map add_binary \
- /usr/bin/journalctl \
- /usr/bin/systemd-tmpfiles \
- /usr/lib/systemd/systemd-hibernate-resume \
- /usr/lib/systemd/systemd-shutdown \
- /usr/lib/systemd/systemd-sulogin-shell \
- /usr/lib/systemd/system-generators/systemd-fstab-generator \
- /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
- /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
- # udev rules and systemd units
- map add_udev_rule "$rules" \
- 50-udev-default.rules \
- 60-persistent-storage.rules \
- 64-btrfs.rules \
- 80-drivers.rules \
- 99-systemd.rules
-
- map add_systemd_unit \
- initrd-cleanup.service \
- initrd-fs.target \
- initrd-parse-etc.service \
- initrd-root-fs.target \
- initrd-root-device.target \
- initrd-switch-root.service \
- initrd-switch-root.target \
- initrd-udevadm-cleanup-db.service \
- initrd.target \
- kmod-static-nodes.service \
- local-fs.target \
- local-fs-pre.target \
- paths.target \
- reboot.target \
- slices.target \
- sockets.target \
- swap.target \
- systemd-fsck at .service \
- systemd-hibernate-resume at .service \
- systemd-journald.service \
- systemd-journald-audit.socket \
- systemd-journald-dev-log.socket \
- systemd-modules-load.service \
- systemd-tmpfiles-setup-dev.service \
- systemd-udev-trigger.service \
- systemd-udevd-control.socket \
- systemd-udevd-kernel.socket \
- systemd-udevd.service \
- timers.target \
- rescue.target \
- emergency.target
-
- add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
- add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
- add_binary "$(readlink -f /usr/lib/libnss_files.so)"
- printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
- 'passwd: files' \
- 'group: files' \
- 'shadow: files'
-
- echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
- echo "root::::::::" >"$BUILDROOT/etc/shadow"
- getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
-
- add_dir "/etc/modules-load.d"
- (
- . "$_f_config"
- set -f
- printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
- )
-}
-
-help() {
- cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 388382, systemd/trunk/initcpio-install-systemd)
===================================================================
--- initcpio-install-systemd (rev 0)
+++ initcpio-install-systemd 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,194 @@
+#!/bin/bash
+
+strip_quotes() {
+ local len=${#1} quotes=$'[\'"]' str=${!1}
+
+ if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+ printf -v "$1" %s "${str:1:-1}"
+ fi
+}
+
+add_udev_rule() {
+ # Add an udev rules file to the initcpio image. Dependencies on binaries
+ # will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local rules= rule= key= value= binary=
+
+ rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+ if [[ -z $rules ]]; then
+ # complain about not found rules
+ return 1
+ fi
+
+ add_file "$rules"
+
+ while IFS=, read -ra rule; do
+ # skip empty lines, comments
+ [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+ for pair in "${rule[@]}"; do
+ IFS=' =' read -r key value <<< "$pair"
+ case $key in
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+ strip_quotes 'value'
+ # just take the first word as the binary name
+ binary=${value%% *}
+ [[ ${binary:0:1} == '$' ]] && continue
+ if [[ ${binary:0:1} != '/' ]]; then
+ binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
+ fi
+ add_binary "$binary"
+ ;;
+ esac
+ done
+ done <"$rules"
+}
+
+add_systemd_unit() {
+ # Add a systemd unit file to the initcpio image. Hard dependencies on binaries
+ # and other unit files will be discovered and added.
+ # $1: path to rules file (or name of rules file)
+
+ local unit= rule= entry= key= value= binary= dep=
+
+ unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+ if [[ -z $unit ]]; then
+ # complain about not found unit file
+ return 1
+ fi
+
+ add_file "$unit"
+
+ while IFS='=' read -r key values; do
+ read -ra values <<< "$values"
+
+ case $key in
+ Requires|OnFailure)
+ # only add hard dependencies (not Wants)
+ map add_systemd_unit "${values[@]}"
+ ;;
+ Exec*)
+ # don't add binaries unless they are required
+ if [[ ${values[0]:0:1} != '-' ]]; then
+ add_binary "${values[0]}"
+ fi
+ ;;
+ esac
+
+ done <"$unit"
+
+ # preserve reverse soft dependency
+ for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+ if [[ -L $dep ]]; then
+ add_symlink "$dep"
+ fi
+ done
+
+ # add hard dependencies
+ if [[ -d $unit.requires ]]; then
+ for dep in "$unit".requires/*; do
+ add_systemd_unit ${dep##*/}
+ done
+ fi
+}
+
+add_systemd_drop_in() {
+ local unit=$1 dropin_name=$2
+
+ mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
+ cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
+}
+
+build() {
+ local rules unit
+
+ # from base
+ add_binary /bin/mount
+ add_binary /usr/bin/kmod /usr/bin/modprobe
+ add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/sulogin
+
+ map add_binary \
+ /usr/bin/journalctl \
+ /usr/bin/systemd-tmpfiles \
+ /usr/lib/systemd/systemd-hibernate-resume \
+ /usr/lib/systemd/systemd-shutdown \
+ /usr/lib/systemd/systemd-sulogin-shell \
+ /usr/lib/systemd/system-generators/systemd-fstab-generator \
+ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+ # udev rules and systemd units
+ map add_udev_rule "$rules" \
+ 50-udev-default.rules \
+ 60-persistent-storage.rules \
+ 64-btrfs.rules \
+ 80-drivers.rules \
+ 99-systemd.rules
+
+ map add_systemd_unit \
+ initrd-cleanup.service \
+ initrd-fs.target \
+ initrd-parse-etc.service \
+ initrd-root-fs.target \
+ initrd-root-device.target \
+ initrd-switch-root.service \
+ initrd-switch-root.target \
+ initrd-udevadm-cleanup-db.service \
+ initrd.target \
+ kmod-static-nodes.service \
+ local-fs.target \
+ local-fs-pre.target \
+ paths.target \
+ reboot.target \
+ slices.target \
+ sockets.target \
+ swap.target \
+ systemd-fsck at .service \
+ systemd-hibernate-resume at .service \
+ systemd-journald.service \
+ systemd-journald-audit.socket \
+ systemd-journald-dev-log.socket \
+ systemd-modules-load.service \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-udev-trigger.service \
+ systemd-udevd-control.socket \
+ systemd-udevd-kernel.socket \
+ systemd-udevd.service \
+ timers.target \
+ rescue.target \
+ emergency.target
+
+ add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+ add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
+
+ add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+ printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
+ 'passwd: files' \
+ 'group: files' \
+ 'shadow: files'
+
+ echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo "root::::::::" >"$BUILDROOT/etc/shadow"
+ getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
+
+ add_dir "/etc/modules-load.d"
+ (
+ . "$_f_config"
+ set -f
+ printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+ )
+}
+
+help() {
+ cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: initcpio-install-udev
===================================================================
--- initcpio-install-udev 2020-06-06 19:38:30 UTC (rev 388382)
+++ initcpio-install-udev 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-build() {
- local rules tool
-
- add_binary /usr/lib/systemd/systemd-udevd
- add_binary /usr/bin/udevadm
- add_binary /usr/bin/systemd-tmpfiles
-
- for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook adds the udev daemon to the initramfs, allowing for dynamic loading
-of modules and reliable detection of the root device via tags (e.g. UUID or
-LABEL). Do not remove this hook unless you are using the systemd hook, or you
-know what you're doing.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 388382, systemd/trunk/initcpio-install-udev)
===================================================================
--- initcpio-install-udev (rev 0)
+++ initcpio-install-udev 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+build() {
+ local rules tool
+
+ add_binary /usr/lib/systemd/systemd-udevd
+ add_binary /usr/bin/udevadm
+ add_binary /usr/bin/systemd-tmpfiles
+
+ for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
+ add_file "/usr/lib/udev/rules.d/$rules"
+ done
+ for tool in ata_id scsi_id; do
+ add_file "/usr/lib/udev/$tool"
+ done
+
+ add_runscript
+}
+
+help() {
+ cat <<HELPEOF
+This hook adds the udev daemon to the initramfs, allowing for dynamic loading
+of modules and reliable detection of the root device via tags (e.g. UUID or
+LABEL). Do not remove this hook unless you are using the systemd hook, or you
+know what you're doing.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
Deleted: loader.conf
===================================================================
--- loader.conf 2020-06-06 19:38:30 UTC (rev 388382)
+++ loader.conf 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1 +0,0 @@
-default arch
Copied: systemd/repos/testing-x86_64/loader.conf (from rev 388382, systemd/trunk/loader.conf)
===================================================================
--- loader.conf (rev 0)
+++ loader.conf 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1 @@
+default arch
Deleted: splash-arch.bmp
===================================================================
(Binary files differ)
Copied: systemd/repos/testing-x86_64/splash-arch.bmp (from rev 388382, systemd/trunk/splash-arch.bmp)
===================================================================
(Binary files differ)
Deleted: systemd-hook
===================================================================
--- systemd-hook 2020-06-06 19:38:30 UTC (rev 388382)
+++ systemd-hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-
-systemd_live() {
- if [ ! -d /run/systemd/system ]; then
- echo >&2 " Skipped: Current root is not booted."
- exit 0
- fi
-}
-
-udevd_live() {
- if [ ! -d /run/udev ]; then
- echo >&2 " Skipped: Device manager is not running."
- exit 0
- fi
-}
-
-op="$1"; shift
-
-case "$op" in
- catalog) /usr/bin/journalctl --update-catalog ;;
- hwdb) /usr/bin/systemd-hwdb --usr update ;;
- update) touch -c /usr ;;
- sysusers) /usr/bin/systemd-sysusers ;;
- tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
-
- daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
- udev-reload) udevd_live; /usr/bin/udevadm control --reload ;;
- binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;
- sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;
-
- # For use by other packages
- reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;
-
- *) echo >&2 " Invalid operation '$op'"; exit 1 ;;
-esac
-
-exit 0
Copied: systemd/repos/testing-x86_64/systemd-hook (from rev 388382, systemd/trunk/systemd-hook)
===================================================================
--- systemd-hook (rev 0)
+++ systemd-hook 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,37 @@
+#!/bin/sh -e
+
+systemd_live() {
+ if [ ! -d /run/systemd/system ]; then
+ echo >&2 " Skipped: Current root is not booted."
+ exit 0
+ fi
+}
+
+udevd_live() {
+ if [ ! -d /run/udev ]; then
+ echo >&2 " Skipped: Device manager is not running."
+ exit 0
+ fi
+}
+
+op="$1"; shift
+
+case "$op" in
+ catalog) /usr/bin/journalctl --update-catalog ;;
+ hwdb) /usr/bin/systemd-hwdb --usr update ;;
+ update) touch -c /usr ;;
+ sysusers) /usr/bin/systemd-sysusers ;;
+ tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
+
+ daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
+ udev-reload) udevd_live; /usr/bin/udevadm control --reload ;;
+ binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;
+ sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;
+
+ # For use by other packages
+ reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;;
+
+ *) echo >&2 " Invalid operation '$op'"; exit 1 ;;
+esac
+
+exit 0
Deleted: systemd-user.pam
===================================================================
--- systemd-user.pam 2020-06-06 19:38:30 UTC (rev 388382)
+++ systemd-user.pam 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,5 +0,0 @@
-# Used by systemd --user instances.
-
-account include system-login
-session required pam_loginuid.so
-session include system-login
Copied: systemd/repos/testing-x86_64/systemd-user.pam (from rev 388382, systemd/trunk/systemd-user.pam)
===================================================================
--- systemd-user.pam (rev 0)
+++ systemd-user.pam 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,5 @@
+# Used by systemd --user instances.
+
+account include system-login
+session required pam_loginuid.so
+session include system-login
Deleted: systemd.install
===================================================================
--- systemd.install 2020-06-06 19:38:30 UTC (rev 388382)
+++ systemd.install 2020-06-06 19:39:05 UTC (rev 388383)
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-sd_booted() {
- [[ -d run/systemd/system && ! -L run/systemd/system ]]
-}
-
-add_journal_acls() {
- # ignore errors, since the filesystem might not support ACLs
- setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
- :
-}
-
-post_common() {
- systemd-sysusers
- journalctl --update-catalog
-}
-
-_216_2_changes() {
- echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
- echo ' tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
- if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
- chgrp systemd-journal-remote var/log/journal/remote
- fi
-}
-
-_219_4_changes() {
- if ! systemctl is-enabled -q remote-fs.target; then
- systemctl enable -q remote-fs.target
- fi
-}
-
-_230_1_changes() {
- echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-_232_8_changes() {
- # paper over possible effects of CVE-2016-10156
- local stamps=(/var/lib/systemd/timers/*.timer)
-
- if [[ -f ${stamps[0]} ]]; then
- chmod 0644 "${stamps[@]}"
- fi
-}
-
-_233_75_3_changes() {
- # upstream installs services to /etc, which we remove
- # to keep bus activation we re-enable systemd-resolved
- if systemctl is-enabled -q systemd-resolved.service; then
- systemctl reenable systemd-resolved.service 2>/dev/null
- fi
-}
-
-_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
- fi
-}
-
-post_install() {
- systemd-machine-id-setup
-
- post_common "$@"
-
- add_journal_acls
-
- # enable some services by default, but don't track them
- systemctl enable getty at tty1.service remote-fs.target
-
- echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
- echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
-
- # group 'systemd-journal-remote' is created by systemd-sysusers
- mkdir -m2755 var/log/journal/remote
- chgrp systemd-journal-remote var/log/journal/remote
-}
-
-post_upgrade() {
- post_common "$@"
-
- # don't reexec if the old version is 231-1 or 231-2.
- # https://github.com/systemd/systemd/commit/bd64d82c1c
- if [[ $1 != 231-[12] ]] && sd_booted; then
- systemctl --system daemon-reexec
- fi
-
- local v upgrades=(
- 216-2
- 219-2
- 219-4
- 230-1
- 232-8
- 233.75-3
- 242.0-2
- )
-
- for v in "${upgrades[@]}"; do
- if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
- "_${v//[.-]/_}_changes"
- fi
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-x86_64/systemd.install (from rev 388382, systemd/trunk/systemd.install)
===================================================================
--- systemd.install (rev 0)
+++ systemd.install 2020-06-06 19:39:05 UTC (rev 388383)
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+sd_booted() {
+ [[ -d run/systemd/system && ! -L run/systemd/system ]]
+}
+
+add_journal_acls() {
+ # ignore errors, since the filesystem might not support ACLs
+ setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null
+ :
+}
+
+post_common() {
+ systemd-sysusers
+ journalctl --update-catalog
+}
+
+_216_2_changes() {
+ echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
+ echo ' tuned in /etc/systemd/coredump.conf.'
+}
+
+_219_2_changes() {
+ if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+ chgrp systemd-journal-remote var/log/journal/remote
+ fi
+}
+
+_219_4_changes() {
+ if ! systemctl is-enabled -q remote-fs.target; then
+ systemctl enable -q remote-fs.target
+ fi
+}
+
+_230_1_changes() {
+ echo ':: systemd-bootchart is no longer included with systemd'
+}
+
+_232_8_changes() {
+ # paper over possible effects of CVE-2016-10156
+ local stamps=(/var/lib/systemd/timers/*.timer)
+
+ if [[ -f ${stamps[0]} ]]; then
+ chmod 0644 "${stamps[@]}"
+ fi
+}
+
+_233_75_3_changes() {
+ # upstream installs services to /etc, which we remove
+ # to keep bus activation we re-enable systemd-resolved
+ if systemctl is-enabled -q systemd-resolved.service; then
+ systemctl reenable systemd-resolved.service 2>/dev/null
+ fi
+}
+
+_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
+ fi
+}
+
+post_install() {
+ systemd-machine-id-setup
+
+ post_common "$@"
+
+ add_journal_acls
+
+ # enable some services by default, but don't track them
+ systemctl enable getty at tty1.service remote-fs.target
+
+ echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
+ echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
+
+ # group 'systemd-journal-remote' is created by systemd-sysusers
+ mkdir -m2755 var/log/journal/remote
+ chgrp systemd-journal-remote var/log/journal/remote
+}
+
+post_upgrade() {
+ post_common "$@"
+
+ # don't reexec if the old version is 231-1 or 231-2.
+ # https://github.com/systemd/systemd/commit/bd64d82c1c
+ if [[ $1 != 231-[12] ]] && sd_booted; then
+ systemctl --system daemon-reexec
+ fi
+
+ local v upgrades=(
+ 216-2
+ 219-2
+ 219-4
+ 230-1
+ 232-8
+ 233.75-3
+ 242.0-2
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//[.-]/_}_changes"
+ fi
+ done
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list