[arm/libre-testing/systemd]: v247.3

1 files changed, 72 insertions, 82 deletions

diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
index 7f16e3585..79745ec2e 100644
--- a/libre-testing/systemd/PKGBUILD
+++ b/libre-testing/systemd/PKGBUILD
@@ -11,27 +11,25 @@ pkgname+=('systemd-common' 'systemd-udev')
 # We split Arch's systemd-libs into systemd-$X, for the following $X:
 _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_systemd_libs[@]/#/systemd-}")
-# Can be from either systemd or systemd-stable
-_commit='0430af90ef28a229e51136ad364e1da7e76c8638'
-pkgver=240.95
-pkgrel=2
-pkgrel+=.par2
+_tag='5ca6cc7f6e95bd98bb014126040d4a5fae541511' # git rev-parse v${pkgver}
+pkgver=247.3
+pkgrel=1
+pkgrel+=.parabola1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
 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'
+             'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers'
              'python-lxml' 'quota-tools' 'shadow' 'git'
              'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
-             'bash-completion')
+             'bash-completion' 'p11-kit' 'systemd')
 makedepends_i686=('gnu-efi-libs' 'pkgconf')
 makedepends_x86_64=('gnu-efi-libs')
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart@poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
-source=(# fragment is latest tag for source verification, final merge in prepare()
-        "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
+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'
         'initcpio-hook-udev'
@@ -42,16 +40,16 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         'splash-parabola.bmp'
         'systemd-user.pam'
         'systemd-hook'
+        '20-systemd-sysusers.hook'
         'udev-hook'
-        'systemd-binfmt.hook'
-        'systemd-catalog.hook'
-        'systemd-daemon-reload.hook'
-        'systemd-hwdb.hook'
-        'systemd-sysctl.hook'
-        'systemd-sysusers.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-udev-reload.hook'
-        'systemd-update.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'
         '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'
         '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'
         '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'
@@ -61,36 +59,34 @@ source=(# fragment is latest tag for source verification, final merge in prepare
         '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')
 sha512sums=('SKIP'
             'SKIP'
-            '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'
+            'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
+            '8e76f8334b95ce7fee9190f4a1016b16109f3a75b68635fc227b2b4791cf8179ef09b532b66b4ed885ddf98ed76befed3106f3c3088f1819ed8cdf4c13e0805a'
             'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
             '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'
+            'd8ed2e26a6562ed7835a861a7a534842befec22475db0442cd26350ac54446bc9fec6b4c8429ed6d983cc600564446ab2827ea10cacef7e950220d01f0961214'
+            '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
             'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'
-            '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'
-            '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'
-            '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'
-            '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'
-            'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'
-            '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'
-            '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'
-            'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
-            '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
-            'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'
-            'ff25035b5ed7b7b1720850573235159dee3d3aa5ca042cd5249094727f0e1d9dbf249d5612a1f2fefc20ed1618000277f2c3542ac513465764a98a3405455be2'
+            '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
+            '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
+            '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
+            'cee9240dac5888d1dde916429ac25c022e30b5d7c53ba9e699e281021d2224bfd6e4cc4ac1c71c15f768b720d524cac0dabaae06d026a68759f6fe84b4c62751'
+            '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de'
+            'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'
+            '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850'
+            '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97'
+            'e963859d9958e527802f118a5ac5f2051343a2ee987f60cae256fc4e8c71f5fe16439375a5d1caf0338f1156775ad087eaab9e8bf9d18633e62ea4d32e713e7f'
+            '3536a497e4d6cfae76296be7bf903c7645d6a85f96f57256196282f91d3845876d74ca121efeb81df8d524ec3c53f614157a90d213a5d3c4bb14958be701fff9'
             'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
             'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
             '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
-            'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'
+            '34acbb7c47b5ccd14adb6982b734cd718d478e3caf3b7f4e15795c3ba39f3c3f03b0a3f8f5a0c29b4342cd923f892daf55dd22598392900946ea8d185c706c78'
             '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
 
 _backports=(
-  # https://github.com/systemd/systemd/issues/11259
-  '8ca9e92c742602b8bcd431001e6f5b78c28c184f'
 )
 
 _reverts=(
@@ -101,15 +97,14 @@ prepare() {
 
   # add upstream repository for cherry-picking
   git remote add -f upstream ../systemd
-  # merge the latest stable commit (fast-foward only to make sure
-  # the verified tag is in)
-  git merge --ff-only "${_commit}"
 
   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
 
@@ -123,15 +118,6 @@ prepare() {
   done
 }
 
-pkgver() {
-  cd "$pkgbase-stable"
-
-  local _version _count
-  _version="$(git describe --abbrev=0 --tags)"
-  _count="$(git rev-list --count ${_version}..)"
-  printf '%s.%s' "${_version#v}" "${_count}"
-}
-
 build() {
   local _timeservers=({0..3}.arch.pool.ntp.org)
   local _nameservers=(
@@ -155,20 +141,27 @@ build() {
   fi
 
   local _meson_options=(
-    # TODO: enable for v241
-    #-Dversion-tag="${pkgver}-${pkgrel}-arch"
+    -Dversion-tag="${pkgver}-${pkgrel}-parabola"
+    -Dmode=release
 
     -Dima=false
     -Dlibidn2=true
     -Dlz4=true
+    -Dman=true
+
+    # We disable DNSSEC by default, it still causes trouble:
+    # https://github.com/systemd/systemd/issues/10579
 
     -Ddbuspolicydir=/usr/share/dbus-1/system.d
+    -Ddefault-dnssec=no
     -Ddefault-hierarchy=hybrid
-    -Ddefault-locale=C
     -Ddefault-kill-user-processes=false
+    -Ddefault-locale=C
+    -Ddns-over-tls=openssl
     -Dfallback-hostname='parabola'
-    -Ddns-servers="${_nameservers[*]}"
+    -Dnologin-path=/usr/bin/nologin
     -Dntp-servers="${_timeservers[*]}"
+    -Ddns-servers="${_nameservers[*]}"
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=
@@ -221,7 +214,7 @@ build() {
   done
 
   install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
-  mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+  mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 \
      -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8
 
   rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}
@@ -234,8 +227,7 @@ check() {
 package_systemd() {
   pkgdesc='system and service manager'
   license=('LGPL2.1')
-  groups=('base-devel')
-  depends=('bash' 'dbus' 'kbd' 'kmod'
+  depends=('bash' 'dbus' 'kbd' 'kmod' 'libkmod.so'
            'systemd-libs' 'pam' 'libelf'
            'util-linux' 'pcre2')
   depends+=("systemd-common=$pkgver-$pkgrel" 'udev')
@@ -249,34 +241,35 @@ package_systemd() {
               '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
           etc/systemd/timesyncd.conf
-          etc/systemd/resolved.conf
           etc/systemd/user.conf)
   install=systemd.install
 
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir"
 
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -rv "$pkgdir"/etc/systemd/system/*
-
   # we'll create this on installation
   rmdir "$pkgdir"/var/log/journal/remote
 
   # executable (symlinks) shipped with systemd-sysvcompat
-  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
+  rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}
 
   # 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/nsswitch.conf
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+  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
@@ -287,11 +280,10 @@ package_systemd() {
   # add mkinitcpio hooks
   install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd
 
-  # 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
+  # The group 'systemd-journal' is allocated dynamically and may have varying
+  # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles
+  # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf)
+  install -d -o root -g root -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
@@ -313,10 +305,11 @@ package_systemd() {
 package_systemd-common() {
   pkgdesc='systemd files shared between split packages'
   license=('LGPL2.1')
-  depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'
-           'libgcrypt' 'libidn2' 'libidn2.so' 'libseccomp' 'libsystemd.so'
+  depends=('acl' 'libacl.so' 'cryptsetup' 'libcryptsetup.so' 'libdbus'
+           'glibc' 'iptables' 'libcap' 'libcap.so'
+           'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'libseccomp' 'libseccomp.so' 'libsystemd.so'
            'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
-           'xz' 'audit')
+           'xz' 'audit' 'libaudit.so' 'libp11-kit' 'libp11-kit.so' 'openssl')
 
   cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
 }
@@ -324,9 +317,8 @@ package_systemd-common() {
 package_systemd-udev() {
   pkgdesc='Userspace device file manager'
   license=('GPL2') # NB: different than the rest
-  groups=('base' 'base-devel')
   depends=("systemd-common=$pkgver-$pkgrel" 'systemd-libudev'
-           'hwids' 'kmod' 'util-linux' 'zlib')
+           'hwids' 'kmod' 'libkmod.so' 'util-linux' 'zlib')
   backup=(etc/udev/udev.conf)
 
   provides+=("${pkgname#systemd-}=$pkgver")
@@ -346,7 +338,7 @@ package_systemd-udev() {
 
 package_systemd-libs() {
   pkgdesc='systemd client libraries metapackage'
-  depends=("${_systemd_libs[@]/libsystemd/libsystemd.so}")
+  depends=("${_systemd_libs[@]}")
   license=('LGPL2.1')
   provides=('libsystemd')
   conflicts=('libsystemd')
@@ -355,7 +347,7 @@ package_systemd-libs() {
 
 package_systemd-libsystemd() {
   pkgdesc='systemd client library'
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+  depends=('glibc' 'libcap' 'libcap.so' 'libgcrypt' 'lz4' 'xz' 'zstd')
   license=('LGPL2.1')
   provides=('libsystemd.so')
 
@@ -368,8 +360,7 @@ package_systemd-libsystemd() {
 
 package_systemd-libudev() {
   pkgdesc='systemd library for enumerating and introspecting local devices'
-  groups=('base' 'base-devel') # match systemd-udev
-  depends=('glibc' 'libcap')
+  depends=('glibc' 'libcap' 'libcap.so')
   license=('LGPL2.1')
   provides=('libudev.so')
 
@@ -382,7 +373,7 @@ package_systemd-libudev() {
 
 package_systemd-nss-systemd() {
   pkgdesc='NSS module providing user and group resolution for dynamic users and groups'
-  depends=('glibc' 'libcap')
+  depends=('glibc' 'libcap' 'libcap.so')
   license=('LGPL2.1')
 
   provides+=("${pkgname#systemd-}=$pkgver")
@@ -394,7 +385,7 @@ package_systemd-nss-systemd() {
 
 package_systemd-nss-myhostname() {
   pkgdesc='NSS module providing hostname resolution for the locally configured system hostname'
-  depends=('glibc' 'libcap')
+  depends=('glibc' 'libcap' 'libcap.so')
   license=('LGPL2.1')
 
   provides+=("${pkgname#systemd-}=$pkgver")
@@ -406,7 +397,7 @@ package_systemd-nss-myhostname() {
 
 package_systemd-nss-mymachines() {
   pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances'
-  depends=('glibc' 'libcap')
+  depends=('glibc' 'libcap' 'libcap.so')
   license=('LGPL2.1')
 
   provides+=("${pkgname#systemd-}=$pkgver")
@@ -418,7 +409,7 @@ package_systemd-nss-mymachines() {
 
 package_systemd-nss-resolve() {
   pkgdesc='NSS module providing hostname resolution via systemd-resolved'
-  depends=('glibc' 'libcap')
+  depends=('glibc' 'libcap' 'libcap.so')
   license=('LGPL2.1')
 
   provides+=("${pkgname#systemd-}=$pkgver")
@@ -447,7 +438,6 @@ package_systemd-resolvconf() {
 package_systemd-sysvcompat() {
   pkgdesc='sysvinit compat for systemd'
   license=('LGPL2.1')
-  groups=('base')
   provides=('init')
   conflicts=('init' 'sysvinit')
   depends=('systemd')
@@ -456,7 +446,7 @@ package_systemd-sysvcompat() {
 
   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
+  for tool in halt poweroff reboot shutdown; do
     ln -s systemctl "$pkgdir"/usr/bin/$tool
   done
 }