[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Tuesday, July 7, 2020 @ 08:57:07
Author: eworm
Revision: 390931
handle special executable prefixes in initramfs
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd | 11 +++
2 files changed, 8 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 06:09:06 UTC (rev 390930)
+++ PKGBUILD2020-07-07 08:57:07 UTC (rev 390931)
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'80ac350fb4dc58c52d4c1ce77a1f91b8cd64d4c99a1c1e24194acac56f9e4a69b2304b13113e93d38459041fa073fe97840776d99ed7e4ce99aa76a3adb39583'
+
'f1f0bc599eb73b96f81e5413a55617ab82978d057dc0cabf226d225bb836a967fe13b84c4f24f64c074b6568026ab81d457512ff20a5918892c47a3a603eaa6e'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-07-07 06:09:06 UTC (rev 390930)
+++ initcpio-install-systemd2020-07-07 08:57:07 UTC (rev 390931)
@@ -69,10 +69,13 @@
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
+# do not add binaries unless they are required,
+# strip special executable prefixes
+case ${values[0]} in
+-*) ;;
+!!*) add_binary "${values[0]#!!}" ;;
+*) add_binary "${values[0]#[@!:+]}" ;;
+esac
;;
esac
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, June 22, 2020 @ 12:16:32
Author: eworm
Revision: 390126
fix root's home inside initramfs
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-22 10:35:14 UTC (rev 390125)
+++ PKGBUILD2020-06-22 12:16:32 UTC (rev 390126)
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'd0218d51c557a8456e8f41a56fa057b525bbcfcfa580cbd58efb14f356854172a8e1f31779e023350645a5e28cd4b9d94b0d7a8a3d2ee22db181c65d8f661a2e'
+
'80ac350fb4dc58c52d4c1ce77a1f91b8cd64d4c99a1c1e24194acac56f9e4a69b2304b13113e93d38459041fa073fe97840776d99ed7e4ce99aa76a3adb39583'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-06-22 10:35:14 UTC (rev 390125)
+++ initcpio-install-systemd2020-06-22 12:16:32 UTC (rev 390126)
@@ -169,7 +169,7 @@
'group: files' \
'shadow: files'
-echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+echo "root:x:0:0:root:/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"
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Wednesday, June 10, 2020 @ 20:59:01
Author: eworm
Revision: 388770
revert changes, but keep locked root account
This had some shortcomings, so we revert. We will develop a
sane solution for this soon.
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd | 11 +--
2 files changed, 2 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-10 20:19:48 UTC (rev 388769)
+++ PKGBUILD2020-06-10 20:59:01 UTC (rev 388770)
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'3e41c029728d80f469375ae1a0fd2107ede128c91ddf58e57058dd45cfd1403f8f0e75de4c1d4349acad84aea9d0011fdb8e1955335dfb619bddd61613dce6ee'
+
'd0218d51c557a8456e8f41a56fa057b525bbcfcfa580cbd58efb14f356854172a8e1f31779e023350645a5e28cd4b9d94b0d7a8a3d2ee22db181c65d8f661a2e'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-06-10 20:19:48 UTC (rev 388769)
+++ initcpio-install-systemd2020-06-10 20:59:01 UTC (rev 388770)
@@ -169,17 +169,8 @@
'group: files' \
'shadow: files'
-# By default we lock the root account in initramfs. A failed service or
-# timeout must not open the opportunity of an unprotected root shell.
-# Overwrite the shadow file in initramfs by creating custom
-# /etc/shadow.initramfs. Be warned: The file may leak from encrypted to
-# unencrypted storage.
echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-if [ -s /etc/shadow.initramfs ]; then
-add_file /etc/shadow.initramfs /etc/shadow
-else
-echo 'root:*:::' >"$BUILDROOT/etc/shadow"
-fi
+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"
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Wednesday, June 10, 2020 @ 20:07:40
Author: eworm
Revision: 388767
lock the root account in initramfs...
but allow to overwrite shadow file in initramfs with custom
/etc/shadow.initramfs.
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd | 11 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-10 18:58:28 UTC (rev 388766)
+++ PKGBUILD2020-06-10 20:07:40 UTC (rev 388767)
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'e5dfc897f281dcfa89dc81b4f24a4098a49b190bff49cea313c20d4ad019e8ebbe07cbe84232bae0579d103bc66ce96d098e0dbd0a93efd19d249ac742060038'
+
'3e41c029728d80f469375ae1a0fd2107ede128c91ddf58e57058dd45cfd1403f8f0e75de4c1d4349acad84aea9d0011fdb8e1955335dfb619bddd61613dce6ee'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-06-10 18:58:28 UTC (rev 388766)
+++ initcpio-install-systemd2020-06-10 20:07:40 UTC (rev 388767)
@@ -169,8 +169,17 @@
'group: files' \
'shadow: files'
+# By default we lock the root account in initramfs. A failed service or
+# timeout must not open the opportunity of an unprotected root shell.
+# Overwrite the shadow file in initramfs by creating custom
+# /etc/shadow.initramfs. Be warned: The file may leak from encrypted to
+# unencrypted storage.
echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-echo "root" >"$BUILDROOT/etc/shadow"
+if [ -s /etc/shadow.initramfs ]; then
+add_file /etc/shadow.initramfs /etc/shadow
+else
+echo 'root:*:::' >"$BUILDROOT/etc/shadow"
+fi
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"
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Friday, June 5, 2020 @ 09:34:15
Author: eworm
Revision: 388336
upgpkg: systemd 245.6-3
* cherry-pick: basic/user-util: always use base 10 for user/group numbers
* initcpio: get required groups from system
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD | 10 --
initcpio-install-systemd | 33 +++--
2 files changed, 11 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-05 09:13:40 UTC (rev 388335)
+++ PKGBUILD2020-06-05 09:34:15 UTC (rev 388336)
@@ -6,7 +6,7 @@
pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
_tag='a47534aa62edfddb2df86e2d0c208979f24dc8c2' # git rev-parse v${pkgver}
pkgver=245.6
-pkgrel=2
+pkgrel=3
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'bc16cd288fa4fe8f8d2d4ba7a3198f942626af08330e4d1656ee38c408b23bb532a1955a1327ec367ae35161e3cc1f336d9285fb9c7d4322f2865451fb9b8961'
+
'e5dfc897f281dcfa89dc81b4f24a4098a49b190bff49cea313c20d4ad019e8ebbe07cbe84232bae0579d103bc66ce96d098e0dbd0a93efd19d249ac742060038'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -79,6 +79,12 @@
# 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=(
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-06-05 09:13:40 UTC (rev 388335)
+++ initcpio-install-systemd2020-06-05 09:34:15 UTC (rev 388336)
@@ -169,37 +169,10 @@
'group: files' \
'shadow: files'
-add_file /etc/passwd <"$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_file /etc/shadow <
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, June 1, 2020 @ 20:53:09
Author: eworm
Revision: 388028
upgpkg: systemd 245.6-1
* update to latest stabe release
* use users and groups from basic.conf in initramfs
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |8
initcpio-install-systemd | 39 +--
2 files changed, 33 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-01 19:45:03 UTC (rev 388027)
+++ PKGBUILD2020-06-01 20:53:09 UTC (rev 388028)
@@ -5,8 +5,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat')
_tag='a520e63382396661d79f630b2babe717a85b1209' # git rev-parse v${pkgver}
-pkgver=245.5
-pkgrel=2
+pkgver=245.6
+pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -14,7 +14,7 @@
'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')
+ 'bash-completion' 'p11-kit' 'systemd')
options=('strip')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering
'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew
Jędrzejewski-Szmek
@@ -44,7 +44,7 @@
'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4'
'85d115c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'
+
'bc16cd288fa4fe8f8d2d4ba7a3198f942626af08330e4d1656ee38c408b23bb532a1955a1327ec367ae35161e3cc1f336d9285fb9c7d4322f2865451fb9b8961'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-06-01 19:45:03 UTC (rev 388027)
+++ initcpio-install-systemd2020-06-01 20:53:09 UTC (rev 388028)
@@ -110,6 +110,7 @@
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 \
@@ -118,9 +119,6 @@
/usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-# for journalctl in emergency shell
-add_binary journalctl
-
# udev rules and systemd units
map add_udev_rule "$rules" \
50-udev-default.rules \
@@ -171,16 +169,37 @@
'group: files' \
'shadow: files'
-echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-echo "root:x:0:root" >"$BUILDROOT/etc/group"
-echo "root" >"$BUILDROOT/etc/shadow"
+add_file /etc/passwd <
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, May 7, 2018 @ 22:02:20 Author: eworm Revision: 323462 install systemd-shutdown to initramfs Modified: systemd/trunk/PKGBUILD systemd/trunk/initcpio-install-systemd --+ PKGBUILD |2 +- initcpio-install-systemd |1 + 2 files changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-05-07 21:14:04 UTC (rev 323461) +++ PKGBUILD2018-05-07 22:02:20 UTC (rev 323462) @@ -43,7 +43,7 @@ 'SKIP' '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '3214b80fb5e3a9eed026dc1d6f23a3785c34b03dd09cba536ad4413322fc0d83936ec3d140ad11ffbf527b4bb8b83887044209c453bd1a25d22d6b9cbcd88288' + '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' Modified: initcpio-install-systemd === --- initcpio-install-systemd2018-05-07 21:14:04 UTC (rev 323461) +++ initcpio-install-systemd2018-05-07 22:02:20 UTC (rev 323462) @@ -112,6 +112,7 @@ map add_binary \ /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 \
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, April 9, 2018 @ 13:36:41 Author: eworm Revision: 321391 add journalctl in initramfs for emergency shell Modified: systemd/trunk/PKGBUILD systemd/trunk/initcpio-install-systemd --+ PKGBUILD |2 +- initcpio-install-systemd |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-09 13:03:18 UTC (rev 321390) +++ PKGBUILD2018-04-09 13:36:41 UTC (rev 321391) @@ -43,7 +43,7 @@ 'SKIP' '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '86d7cacd7536b1069c8208de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c' + '3214b80fb5e3a9eed026dc1d6f23a3785c34b03dd09cba536ad4413322fc0d83936ec3d140ad11ffbf527b4bb8b83887044209c453bd1a25d22d6b9cbcd88288' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' Modified: initcpio-install-systemd === --- initcpio-install-systemd2018-04-09 13:03:18 UTC (rev 321390) +++ initcpio-install-systemd2018-04-09 13:36:41 UTC (rev 321391) @@ -117,6 +117,9 @@ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator +# for journalctl in emergency shell +add_binary journalctl + # udev rules and systemd units map add_udev_rule "$rules" \ 50-udev-default.rules \
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Saturday, August 5, 2017 @ 18:50:50
Author: eworm
Revision: 301688
upgpkg: systemd 234.11-5
add systemd-sulogin-shell to initramfs (FS#55042)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |4 ++--
initcpio-install-systemd |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-08-05 17:55:40 UTC (rev 301687)
+++ PKGBUILD2017-08-05 18:50:50 UTC (rev 301688)
@@ -10,7 +10,7 @@
# Bump this to latest major release for signed tag verification,
# the commit count is handled by pkgver() function.
pkgver=234.11
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="https://www.github.com/systemd/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -35,7 +35,7 @@
sha512sums=('SKIP'
'SKIP'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'691acebb243b9cd7fb63272662f34bdb9aead710c69aee9361ab2322f9f108600ad5b0214fc00b7cb2d9c95db8abd748030625d60d6567efd98663c56ba28c65'
+
'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2017-08-05 17:55:40 UTC (rev 301687)
+++ initcpio-install-systemd2017-08-05 18:50:50 UTC (rev 301688)
@@ -112,6 +112,7 @@
map add_binary \
/usr/bin/systemd-tmpfiles \
/usr/lib/systemd/systemd-hibernate-resume \
+/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
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, November 28, 2016 @ 00:31:52
Author: dreisner
Revision: 282143
upgpkg: systemd 232-4
- backport fix for crash on unicode disk labels (FS#51950)
- fix verbiage in systemd hook about what it replaces
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |5 +++--
initcpio-install-systemd |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-11-27 21:42:26 UTC (rev 282142)
+++ PKGBUILD2016-11-28 00:31:52 UTC (rev 282143)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=232
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="https://www.github.com/systemd/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -24,7 +24,7 @@
'0001-Revert-nspawn-try-to-bind-mount-resolved-s-resolv.co.patch')
sha512sums=('SKIP'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'5a3cf61bb0b8da6061c13fbfce7191c545ccf4c95c5bbf3e47f2b41225f35a4a366e691a04f90b76fd24536ea4cb29ff24585408d4a9972cd0f1279544604abb'
+
'52af734947a768758d5eb3f18e31a1cfec6699eca6fa10e40b90c7f11991509186c0a696e3490af3eaba80064ea4cb93e041579abf05addf072d294300aa4b28'
'fec639de0d99967ed3e67289eff5ff78fff0c5829d350e73bed536a8391f1daa1d118d72dbdc1f480ffd33fc22b72f4817d0973bd09ec7f182fd26ad87b24355'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -40,6 +40,7 @@
'843d5baf6aad6c53fc00ea8d95d83209a4f92de1' # core: don't use the unified
hierarchy for the systemd cgroup yet (#4628)
'abd67ce74858491565cde157c7b08fda43d3279c' # basic/virt: fix userns check
on CONFIG_USER_NS=n kernel (#4651)
'4318abe8d26e969ebdb97744a63ab900233a0185' # build-sys: do not install
ctrl-alt-del.target symlink twice
+ 'd112eae7da77899be245ab52aa1747d4675549f1' # device: Avoid calling
unit_free(NULL) in device setup logic (#4748)
)
_validate_tag() {
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-11-27 21:42:26 UTC (rev 282142)
+++ initcpio-install-systemd2016-11-28 00:31:52 UTC (rev 282143)
@@ -185,7 +185,7 @@
help() {
cat <
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Friday, September 30, 2016 @ 10:45:29
Author: dreisner
Revision: 277462
upgpkg: systemd 231-2
- backport fix for local denial-of-service (FS#51035)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |8 ++--
initcpio-install-systemd |8
2 files changed, 14 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-09-30 10:06:00 UTC (rev 277461)
+++ PKGBUILD2016-09-30 10:45:29 UTC (rev 277462)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=231
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -22,7 +22,7 @@
'udev-hwdb.hook')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- 'bee7fd6ccda39582259708e3f262ea6d'
+ '55ea7d81c02d090b65c42a88f1a5a21a'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
@@ -30,6 +30,9 @@
'a475a5ed8f03fb0f6b58b4684998d05c')
_backports=(
+ '531ac2b2349da02acc9c382849758e07eb92b020'
+ 'b2922837d67a4bf66c7862b06eb5b513a7fe6ef6'
+ '6bd74eb055ad278904d152b08e26d5ad4241ddb0'
)
prepare() {
@@ -155,6 +158,7 @@
license=('GPL2')
provides=('libsystemd.so' 'libudev.so')
+ # TODO(dreisner): for v232, this should be install-rootlibLTLIBRARIES.
make -C "$pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES
}
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-09-30 10:06:00 UTC (rev 277461)
+++ initcpio-install-systemd2016-09-30 10:45:29 UTC (rev 277462)
@@ -147,6 +147,7 @@
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 \
@@ -172,6 +173,13 @@
ExecStart=
ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
EOF
+
+add_dir "/etc/modules-load.d"
+(
+ . "$_f_config"
+ set -f
+ printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+)
}
help() {
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Monday, July 4, 2016 @ 13:46:25
Author: dreisner
Revision: 270933
upgpkg: systemd 230-6
- backport some more trivial fixes
- ensure udevd runs with --resolve-names=never in early userspace (FS#49849)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD | 10 --
initcpio-install-systemd | 13 +
2 files changed, 21 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-07-04 07:55:14 UTC (rev 270932)
+++ PKGBUILD2016-07-04 13:46:25 UTC (rev 270933)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=230
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -22,7 +22,7 @@
'udev-hwdb.hook')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- '8a093826cbce909e34f15dccd73974c4'
+ 'bee7fd6ccda39582259708e3f262ea6d'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
@@ -47,6 +47,12 @@
# resolved: when restarting a transaction make sure to not touch it anymore
(#3553)
5278bbfe0c79c1f2b5bf8a215d8e7d63f1900ce9
+
+ # basic: pass flags to the fnmatch
+ 2027927b1002a74d24300704a655614f8ea48e45
+
+ # nspawn: fix uid patching logic
+ 0c6aeb4609f619328b9dcf8d8d815bd06e412ac5
)
prepare() {
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-07-04 07:55:14 UTC (rev 270932)
+++ initcpio-install-systemd2016-07-04 13:46:25 UTC (rev 270933)
@@ -93,6 +93,13 @@
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
@@ -159,6 +166,12 @@
echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
echo "root:x:0:root" >"$BUILDROOT/etc/group"
echo "root" >"$BUILDROOT/etc/shadow"
+
+add_systemd_drop_in systemd-udevd.service resolve-names <
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Saturday, June 18, 2016 @ 13:48:54
Author: dreisner
Revision: 270174
upgpkg: systemd 230-5
- backport fix for ipv6 gateway autoconfiguration (FS#47572)
- add rescue/emergency targets and needed machinery (FS#36265)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD | 10 --
initcpio-install-systemd | 11 ---
2 files changed, 16 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-06-18 06:38:43 UTC (rev 270173)
+++ PKGBUILD2016-06-18 13:48:54 UTC (rev 270174)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=230
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -22,7 +22,7 @@
'udev-hwdb.hook')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- 'cfb3f8ea657ab24535cc061bb38ec4c1'
+ '8a093826cbce909e34f15dccd73974c4'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
@@ -41,6 +41,12 @@
# automount: handle expire_tokens when the mount unit changes its state
(#3434)
0a62f81045dd810c8f1223cccbac4d706ea2cb45
+
+ # networkd: networkd: ndisc set SO_BINDTODEVICE on socket (#3294)
+ 15fec93be37f12ef6c36a3e8f7dbb1984e1bcfe7
+
+ # resolved: when restarting a transaction make sure to not touch it anymore
(#3553)
+ 5278bbfe0c79c1f2b5bf8a215d8e7d63f1900ce9
)
prepare() {
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-06-18 06:38:43 UTC (rev 270173)
+++ initcpio-install-systemd2016-06-18 13:48:54 UTC (rev 270174)
@@ -100,6 +100,7 @@
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/systemd-tmpfiles \
@@ -144,7 +145,9 @@
systemd-udevd-control.socket \
systemd-udevd-kernel.socket \
systemd-udevd.service \
-timers.target
+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"
@@ -152,8 +155,10 @@
# udev wants /etc/group since it doesn't launch with --resolve-names=never
add_file "/etc/nsswitch.conf"
add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-add_file "/etc/passwd"
-add_file "/etc/group"
+
+echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+echo "root:x:0:root" >"$BUILDROOT/etc/group"
+echo "root" >"$BUILDROOT/etc/shadow"
}
help() {
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Sunday, May 22, 2016 @ 20:20:44
Author: dreisner
Revision: 268484
upgpkg: systemd 230-2
- include initrd-root-device.target in initramfs
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |4 ++--
initcpio-install-systemd |1 +
2 files changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-05-22 17:23:47 UTC (rev 268483)
+++ PKGBUILD2016-05-22 18:20:44 UTC (rev 268484)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=230
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -22,7 +22,7 @@
'udev-hwdb.hook')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- '976c5511b6493715e381f43f16cdb151'
+ '19185c46811f7e056a760864870bfb4c'
'1b3aa3a0551b08af9305d33f85b5c2fc'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-05-22 17:23:47 UTC (rev 268483)
+++ initcpio-install-systemd2016-05-22 18:20:44 UTC (rev 268484)
@@ -123,6 +123,7 @@
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 \
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Thursday, June 25, 2015 @ 00:02:33
Author: heftig
Revision: 241261
initcpio-install-systemd: Use add_binary for the generators, too
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd | 11 ---
2 files changed, 5 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-24 21:56:01 UTC (rev 241260)
+++ PKGBUILD2015-06-24 22:02:33 UTC (rev 241261)
@@ -21,7 +21,7 @@
'splash-arch.bmp')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- '5fde57294d72d2bcfcb531f10ae4d26f'
+ '976c5511b6493715e381f43f16cdb151'
'bde43090d4ac0ef048e3eaee8202a407'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2015-06-24 21:56:01 UTC (rev 241260)
+++ initcpio-install-systemd2015-06-24 22:02:33 UTC (rev 241261)
@@ -102,17 +102,14 @@
add_binary /usr/lib/systemd/systemd /init
map add_binary \
+/usr/bin/systemd-tmpfiles \
/usr/lib/systemd/systemd-hibernate-resume \
-/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator \
-/usr/bin/systemd-tmpfiles
+/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
add_module kdbus?
-# generators
-map add_file \
-/usr/lib/systemd/system-generators/systemd-fstab-generator \
-/usr/lib/systemd/system-generators/systemd-gpt-auto-generator
-
# udev rules and systemd units
map add_udev_rule $rules \
50-udev-default.rules \
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Wednesday, June 24, 2015 @ 23:44:01
Author: heftig
Revision: 241258
initcpio-install-systemd: Add kdbus module if found
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd |2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-24 17:07:23 UTC (rev 241257)
+++ PKGBUILD2015-06-24 21:44:01 UTC (rev 241258)
@@ -21,7 +21,7 @@
'splash-arch.bmp')
md5sums=('SKIP'
'90ea67a7bb237502094914622a39e281'
- '8516a7bd65157d0115c113118c10c3f3'
+ '5fde57294d72d2bcfcb531f10ae4d26f'
'bde43090d4ac0ef048e3eaee8202a407'
'20ead378f5d6df4b2a3e670301510a7d'
'ddaef54f68f6c86c6c07835fc668f62a'
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2015-06-24 17:07:23 UTC (rev 241257)
+++ initcpio-install-systemd2015-06-24 21:44:01 UTC (rev 241258)
@@ -106,6 +106,8 @@
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator \
/usr/bin/systemd-tmpfiles
+add_module kdbus?
+
# generators
map add_file \
/usr/lib/systemd/system-generators/systemd-fstab-generator \
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Friday, October 31, 2014 @ 16:37:41
Author: dreisner
Revision: 225519
upgpkg: systemd 217-3
- fix brain-o in systemd install hook, ensure /init exists
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |4 ++--
initcpio-install-systemd |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-31 14:15:17 UTC (rev 225518)
+++ PKGBUILD2014-10-31 15:37:41 UTC (rev 225519)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=217
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url=http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -26,7 +26,7 @@
'7aaf44ce842deb449fca0f2595bbc1e4'
'4adc3ddce027693bafa53089322e859b'
'29245f7a240bfba66e2b1783b63b6b40'
- '030a01fd468af520a749159b0a582eba'
+ '455b68a9a15f634dcfdaff2463010d4e'
'bde43090d4ac0ef048e3eaee8202a407')
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2014-10-31 14:15:17 UTC (rev 225518)
+++ initcpio-install-systemd2014-10-31 15:37:41 UTC (rev 225519)
@@ -98,11 +98,11 @@
# from base
add_binary /bin/mount
add_binary /usr/bin/kmod /usr/bin/modprobe
+add_binary /usr/lib/systemd/systemd /init
map add_binary \
/usr/lib/systemd/systemd-hibernate-resume \
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator \
-/usr/lib/systemd/systemd /init \
/usr/bin/systemd-tmpfiles
# generators
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Thursday, February 27, 2014 @ 21:10:19
Author: dreisner
Revision: 206491
upgpkg: systemd 210-2
- fix breakage in systemd hook caused by change in bash 4.3 behavior (FS#39059)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |4 ++--
initcpio-install-systemd |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-27 18:34:58 UTC (rev 206490)
+++ PKGBUILD2014-02-27 20:10:19 UTC (rev 206491)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=210
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url=http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -17,7 +17,7 @@
'initcpio-install-udev')
md5sums=('03efddf8c9eca36d4d590f9967e7e818'
'29245f7a240bfba66e2b1783b63b6b40'
- '8b68b0218a3897d4d37a6ccf47914774'
+ '5e04f468a13ae2b9d6a9dfc77c49a7d1'
'bde43090d4ac0ef048e3eaee8202a407')
build() {
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2014-02-27 18:34:58 UTC (rev 206490)
+++ initcpio-install-systemd2014-02-27 20:10:19 UTC (rev 206491)
@@ -4,7 +4,7 @@
local len=${#1} quotes=$'[\']' str=${!1}
if [[ ${str:0:1} = ${str: -1} ${str:0:1} = $quotes ]]; then
-declare -g $1=${str:1:-1}
+printf -v $1 %s ${str:1:-1}
fi
}
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Friday, September 20, 2013 @ 00:19:40
Author: dreisner
Revision: 194635
upgpkg: systemd 207-5
- fix systemd install hook (FS#36995)
- add debug package (not hosted in testing/core)
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |8 +---
initcpio-install-systemd |4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-09-19 20:03:34 UTC (rev 194634)
+++ PKGBUILD2013-09-19 22:19:40 UTC (rev 194635)
@@ -4,13 +4,13 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=207
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
url=http://www.freedesktop.org/wiki/Software/systemd;
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl'
'gobject-introspection' 'gperf'
'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd'
'libxslt'
'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
+options=('!libtool' 'strip' 'debug')
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz;
'initcpio-hook-udev'
'initcpio-install-systemd'
@@ -20,7 +20,7 @@
0002-swap-create-.wants-symlink-to-auto-swap-devices.patch)
md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88'
'29245f7a240bfba66e2b1783b63b6b40'
- '3ded8dde31e9449567cf205c50d91c89'
+ '8b68b0218a3897d4d37a6ccf47914774'
'bde43090d4ac0ef048e3eaee8202a407'
'9eb0a46aa2a3a6d74117f9a174dbe168'
'182be4c729aaecde249b7b05b48a481f'
@@ -37,6 +37,8 @@
build() {
cd $pkgname-$pkgver
+ CFLAGS+=' -g'
+
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2013-09-19 20:03:34 UTC (rev 194634)
+++ initcpio-install-systemd2013-09-19 22:19:40 UTC (rev 194635)
@@ -115,7 +115,7 @@
99-systemd.rules \
map add_systemd_unit \
-ctrl-alt-del.target
+ctrl-alt-del.target \
initrd-cleanup.service \
initrd-fs.target \
initrd-parse-etc.service \
@@ -132,7 +132,7 @@
systemd-udev-trigger.service \
systemd-udevd-control.socket \
systemd-udevd-kernel.socket \
-systemd-udevd.service \
+systemd-udevd.service
add_symlink /usr/lib/systemd/system/default.target initrd.target
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Tuesday, July 23, 2013 @ 15:44:23
Author: dreisner
Revision: 191313
upgpkg: systemd 206-1
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--+
PKGBUILD |2 +-
initcpio-install-systemd | 14 --
2 files changed, 9 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-23 13:39:28 UTC (rev 191312)
+++ PKGBUILD2013-07-23 13:44:23 UTC (rev 191313)
@@ -18,7 +18,7 @@
'initcpio-install-udev')
md5sums=('89e36f2d3ba963020b72738549954cbc'
'2de72238ed5c0df62a7c3b6bdaf8cb7c'
- '8bbda541cd275a82134de472e832d49d'
+ 'ee6565a05be172de8f12e0a139ba8df4'
'd83d45e67cd75cdbafb81c96a7485319')
build() {
Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2013-07-23 13:39:28 UTC (rev 191312)
+++ initcpio-install-systemd2013-07-23 13:44:23 UTC (rev 191313)
@@ -134,17 +134,19 @@
# TODO: make sure this is no longer necessary when systemctl moves to
sd-bus
add_file /etc/nsswitch.conf
add_file /etc/passwd
+add_binary /lib/libnss_files-2.17.so
+
+# udev wants /etc/group since it doesn't launch with --resolve-names=never
add_file /etc/group
-add_file /lib/libnss_files-2.17.so
-add_symlink /lib/libnss_files.so.2 libnss_files-2.17.so
-add_symlink /lib/libnss_files.so libnss_files.so.2
}
help() {
cat HELPEOF
-This will install a basic systemd setup on your initrd, it is meant to replace
-the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks would need to be
-ported, and may not work as intended.
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks would need
+to be ported, and may 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
}
[arch-commits] Commit in systemd/trunk (PKGBUILD initcpio-install-systemd)
Date: Tuesday, July 23, 2013 @ 01:52:11
Author: tomegun
Revision: 191269
add systemd initcpio hook
This hook allows you to boot with systemd in the initcpio instead of the
current 'base'.
Added:
systemd/trunk/initcpio-install-systemd
Modified:
systemd/trunk/PKGBUILD
--+
PKGBUILD |3
initcpio-install-systemd | 147 +
2 files changed, 150 insertions(+)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-22 18:59:43 UTC (rev 191268)
+++ PKGBUILD2013-07-22 23:52:11 UTC (rev 191269)
@@ -16,12 +16,14 @@
0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
'initcpio-hook-udev'
+'initcpio-install-systemd'
'initcpio-install-udev'
'initcpio-install-timestamp')
md5sums=('a07619bb19f48164fbf0761d12fd39a8'
'7f39f9fde1ff7b48293ed1e3d0a6c213'
'66e3162856ded8eb7dc7383405c6e0d6'
'e99e9189aa2f6084ac28b8ddf605aeb8'
+ 'f5edda743fb0611f11f9b82ecddcf4b3'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d')
@@ -110,6 +112,7 @@
s#GROUP=cdrom#GROUP=optical#g'
$pkgdir/usr/lib/udev/rules.d/*.rules
# add mkinitcpio hooks
+ install -Dm644 $srcdir/initcpio-install-systemd
$pkgdir/usr/lib/initcpio/install/systemd
install -Dm644 $srcdir/initcpio-install-udev
$pkgdir/usr/lib/initcpio/install/udev
install -Dm644 $srcdir/initcpio-hook-udev
$pkgdir/usr/lib/initcpio/hooks/udev
install -Dm644 $srcdir/initcpio-install-timestamp
$pkgdir/usr/lib/initcpio/install/timestamp
Added: initcpio-install-systemd
===
--- initcpio-install-systemd(rev 0)
+++ initcpio-install-systemd2013-07-22 23:52:11 UTC (rev 191269)
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+add_udev_rules() {
+# 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
+for pair in ${rule[@]}; do
+IFS='=' read -r key value $pair
+
+case $key in
+RUN@({program}|)@(+|)|IMPORT{program}|ENV{REMOVE_CMD})
+binary=${value[0]#\}
+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,/lib/systemd/system}/*.wants/${unit##*/}; do
+if [[ -h ${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
+}
+
+build() {
+local rules unit
+
+# from base
+add_binary /bin/mount
+add_binary /usr/bin/kmod /usr/bin/modprobe
+
+# systemd
+add_binary /usr/lib/systemd/systemd /init
+
+# generate sysroot.mount and sysroot-usr.mount
+add_file /usr/lib/systemd/system-generators/systemd-fstab-generator
+
+# udev rules and systemd units
+for rules in \
+50-udev-default.rules \
+60-persistent-storage.rules \
+64-btrfs.rules \
+80-drivers.rules \
+99-systemd.rules \
