sync with upstream

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

3 files changed, 21 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c48747776f9..671e4a7f8fea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-git
 	pkgdesc = systemd (git version)
-	pkgver = 246.r927.gc7828862b3
+	pkgver = 247.r135.g7509c7fdf9
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -60,7 +60,7 @@ pkgbase = systemd-git
 	sha512sums = SKIP
 	sha512sums = e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4
 	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
-	sha512sums = f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e
+	sha512sums = 8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a
 	sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a
 	sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
 	sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -121,10 +121,10 @@ pkgname = systemd-git
 	optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
 	optdepends = polkit: allow administration as unprivileged user
 	optdepends = curl: machinectl pull-tar and pull-raw
-	provides = systemd=246.r927.gc7828862b3
+	provides = systemd=247.r135.g7509c7fdf9
 	provides = nss-myhostname
-	provides = systemd-tools=246.r927.gc7828862b3
-	provides = udev=246.r927.gc7828862b3
+	provides = systemd-tools=247.r135.g7509c7fdf9
+	provides = udev=247.r135.g7509c7fdf9
 	conflicts = systemd
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
@@ -134,11 +134,13 @@ pkgname = systemd-git
 	replaces = udev
 	backup = etc/pam.d/systemd-user
 	backup = etc/systemd/coredump.conf
+	backup = etc/systemd/homed.conf
 	backup = etc/systemd/journald.conf
 	backup = etc/systemd/journal-remote.conf
 	backup = etc/systemd/journal-upload.conf
 	backup = etc/systemd/logind.conf
 	backup = etc/systemd/networkd.conf
+	backup = etc/systemd/pstore.conf
 	backup = etc/systemd/resolved.conf
 	backup = etc/systemd/sleep.conf
 	backup = etc/systemd/system.conf
@@ -155,7 +157,7 @@ pkgname = systemd-libs-git
 	depends = lz4
 	depends = xz
 	depends = zstd
-	provides = systemd-libs=246.r927.gc7828862b3
+	provides = systemd-libs=247.r135.g7509c7fdf9
 	provides = libsystemd
 	provides = libsystemd.so
 	provides = libudev.so
@@ -167,7 +169,7 @@ pkgname = systemd-resolvconf-git
 	pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version)
 	license = LGPL2.1
 	depends = systemd-git
-	provides = systemd-resolvconf=246.r927.gc7828862b3
+	provides = systemd-resolvconf=247.r135.g7509c7fdf9
 	provides = openresolv
 	provides = resolvconf
 	conflicts = systemd-resolvconf
@@ -177,7 +179,7 @@ pkgname = systemd-sysvcompat-git
 	pkgdesc = sysvinit compat for systemd (git version)
 	license = GPL2
 	depends = systemd-git
-	provides = systemd-sysvcompat=246.r927.gc7828862b3
+	provides = systemd-sysvcompat=247.r135.g7509c7fdf9
 	conflicts = systemd-sysvcompat
 	conflicts = sysvinit
 
diff --git a/PKGBUILD b/PKGBUILD
index ea85b7ddd4d2..3b67c28ade33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 pkgbase=systemd-git
 _pkgbase=systemd
 pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
-pkgdesc="systemd (git version)"
-pkgver=246.r927.gc7828862b3
+pkgdesc='systemd (git version)'
+pkgver=247.r135.g7509c7fdf9
 pkgrel=1
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
@@ -41,7 +41,7 @@ source=('git+https://github.com/systemd/systemd'
 sha512sums=('SKIP'
             'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
+            '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
             'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -93,6 +93,7 @@ build() {
 
   local _meson_options=(
     -Dversion-tag="${pkgver}-${pkgrel}-arch"
+    -Dmode=release
 
     -Dgnu-efi=true
     -Dima=false
@@ -123,13 +124,12 @@ build() {
   ninja -C build
 }
 
-
 check() {
   meson test -C build
 }
 
 package_systemd-git() {
-  pkgdesc="system and service manager (git version)"
+  pkgdesc='system and service manager (git version)'
   license=('GPL2' 'LGPL2.1')
   depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus'
            'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so'
@@ -147,11 +147,13 @@ package_systemd-git() {
               'curl: machinectl pull-tar and pull-raw')
   backup=(etc/pam.d/systemd-user
           etc/systemd/coredump.conf
+          etc/systemd/homed.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/pstore.conf
           etc/systemd/resolved.conf
           etc/systemd/sleep.conf
           etc/systemd/system.conf
@@ -241,13 +243,12 @@ package_systemd-resolvconf-git() {
   ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz
 }
 
-
 package_systemd-sysvcompat-git() {
   pkgdesc='sysvinit compat for systemd (git version)'
   license=('GPL2')
+  conflicts=('systemd-sysvcompat' 'sysvinit')
   depends=('systemd-git')
   provides=("systemd-sysvcompat=$pkgver")
-  conflicts=('systemd-sysvcompat' 'sysvinit')
 
   install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
     build/man/{halt,poweroff,reboot,shutdown}.8
diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index 9e23070dd53f..18846528cecc 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -106,11 +106,11 @@ add_systemd_drop_in() {
 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/mount
     add_binary /usr/bin/sulogin
+    add_binary /usr/bin/umount
+    add_binary /usr/lib/systemd/systemd /init
 
     map add_binary \
         /usr/bin/journalctl \