summaryrefslogtreecommitdiff
path: root/src/stage4/patches/systemd.patch
blob: f9158248ed4b53bab03298e47943ae36da158afb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
diff -rupN a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD	2018-04-17 19:26:37.026578845 +0200
+++ b/PKGBUILD	2018-04-17 22:07:42.832662745 +0200
@@ -85,6 +85,10 @@ sha512sums=('SKIP'
 _backports=(
   # nspawn: wait for network namespace creation before interface setup (#8633)
   '7511655807e90aa33ea7b71991401a79ec36bb41'
+  # basic/macros: rename noreturn into _noreturn_ (#8456)
+  '848e863acc51ecfb0f3955c498874588201d9130'
+  # core: don't include libmount.h in a header file (#8580)
+  '227b8a762fea1458547be2cdf0e6e4aac0079730'
 )
 
 _reverts=(
@@ -261,7 +265,7 @@ package_systemd() {
   rm -rv "$pkgdir"/etc/systemd/system/*
 
   # we'll create this on installation
-  rmdir "$pkgdir"/var/log/journal/remote
+  rm -rf "$pkgdir"/var/log/journal/remote
 
   # executable (symlinks) shipped with systemd-sysvcompat
   rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}