summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-07-11 18:20:13 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-07-12 03:08:16 -0400
commite538b9d7a7043b4dd68316488938534782b8bcbe (patch)
treeb075f9dd9026ba3efc0684d66a4a1f2d760eb78c
parent36874999c237bac6bed665e4380ad5004e46fd4b (diff)
downloadabslibre-e538b9d7a7043b4dd68316488938534782b8bcbe.tar.gz
abslibre-e538b9d7a7043b4dd68316488938534782b8bcbe.tar.bz2
abslibre-e538b9d7a7043b4dd68316488938534782b8bcbe.zip
libre/systemd: Reduce differences with Arch
-rw-r--r--libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch (renamed from libre/systemd/0001-Use-Arch-device-access-groups.patch)0
-rw-r--r--libre/systemd/PKGBUILD8
-rw-r--r--libre/systemd/systemd-hook2
3 files changed, 5 insertions, 5 deletions
diff --git a/libre/systemd/0001-Use-Arch-device-access-groups.patch b/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch
index c511144de..c511144de 100644
--- a/libre/systemd/0001-Use-Arch-device-access-groups.patch
+++ b/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 81ef0929c..694073c69 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer (Arch): Christian Hesse <mail@eworm.de>
# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@parabola.nu>
# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgbase=systemd
@@ -30,7 +30,7 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <
source=(# fragment is latest tag for source verification, final merge in prepare()
"git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
"git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed"
- '0001-Use-Arch-device-access-groups.patch'
+ '0001-Use-Arch-Linux-device-access-groups.patch'
'initcpio-hook-udev'
'initcpio-install-systemd'
'initcpio-install-udev'
@@ -65,7 +65,7 @@ sha512sums=('SKIP'
'6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
- 'd228d9e17bd6061aa6c5007b66ed82c726fdcae822e80b978e707777492c198aab9041a4f31cc8412fe4f3d8c5ba7ad908e9bb9f591f7488f5d8d6772dd14d4d'
+ '6b82386fc20619eefa911cd9cdac8efbd0c7137bba4955e8ae75a0ea378d19dbfccc1f7bde6684f03e5f2badefa4abf20623153d88a170d14499167319586db7'
'5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
'4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
'872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
@@ -107,7 +107,7 @@ prepare() {
done
# Replace cdrom/dialout/tape groups with optical/uucp/storage
- patch -Np1 -i ../0001-Use-Arch-device-access-groups.patch
+ patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
# apply FSDG patches
local _patch
diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook
index 79505dfe8..0a664f2c5 100644
--- a/libre/systemd/systemd-hook
+++ b/libre/systemd/systemd-hook
@@ -22,7 +22,7 @@ case $1 in
tmpfiles) /usr/bin/systemd-tmpfiles --create ;;
daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;
- udev-reload) systemd_live; /usr/bin/udevadm control --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 ;;