Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages /
systemd
Commits:
c3904582 by Sebastian Wiesner at 2023-12-13T11:32:48+01:00
Move ukify hook to ukify package
- - - - -
d3330c30 by Mike Yuan at 2023-12-13T11:46:26+01:00
initcpio-install-systemd: add fstab.initramfs
systemd supports configuring mounts through fstab in initrd.
Let's add /etc/fstab.initramfs to initrd if present, in a similar
form as the sd-encrypt hook.
- - - - -
622ac08f by Hanabishi at 2023-12-13T12:03:45+01:00
cherry-pick: network/networkd-address: don't set up firewall rules here
Closes #20
- - - - -
dc019e56 by Ambareesh "Amby" Balaji at 2023-12-13T12:05:18+01:00
cherry-pick: core: do not make private /dev/ read-only too soon
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- initcpio-install-systemd
Changes:
=====================================
.SRCINFO
=====================================
@@ -80,7 +80,7 @@ pkgbase = systemd
sha512sums = SKIP
sha512sums =
3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e
sha512sums =
4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e
- sha512sums =
442e79012d654e72cde03c8b4b90c7b6e9c9e7803551fdeae79bda945f7aff92f1046f5edc64f75d23614f66b3ef044cc47c862379b3e0695ecff412fec90401
+ sha512sums =
ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba
sha512sums =
a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6
sha512sums =
61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
sha512sums =
c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
=====================================
PKGBUILD
=====================================
@@ -55,7 +55,7 @@ sha512sums=('SKIP'
'SKIP'
'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
'4a6cd0cf6764863985dc5ad774d7c93b574645a05b3295f989342951d43c71696d069641592e37eeadb6d6f0531576de96b6392224452f15cd9f056fae038f8e'
-
'442e79012d654e72cde03c8b4b90c7b6e9c9e7803551fdeae79bda945f7aff92f1046f5edc64f75d23614f66b3ef044cc47c862379b3e0695ecff412fec90401'
+
'ada692514d758fa11e2be6b4c5e1dc2d9d47548f24ada35afdce1dcac918e72ae2251c892773e6cf41fa431c3613a1608668e999eb86a565870fecb55c47b4ba'
'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -74,6 +74,10 @@ sha512sums=('SKIP'
'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_backports=(
+ # network/networkd-address: don't set up firewall rules here
+ '58c6e75f263a1562f5550221af1ec1a9b6046143'
+ # core: do not make private /dev/ read-only too soon
+ 'b0cb93591096b23f1cb3b81825824e11609c1833'
)
_reverts=(
@@ -230,12 +234,13 @@ package_systemd() {
mv "$pkgdir"/usr/share/man/man3 systemd-libs/man3
# ukify shipped in separate package
- # we do *NOT* move the kernel-install files there, as other ways of
- # creating uki exist!
- install -d -m0755 systemd-ukify/{bin,systemd,man1}
+ install -d -m0755 systemd-ukify/{bin,systemd,man1,install.d}
mv "$pkgdir"/usr/bin/ukify systemd-ukify/bin/
mv "$pkgdir"/usr/lib/systemd/ukify systemd-ukify/systemd/
mv "$pkgdir"/usr/share/man/man1/ukify.1 systemd-ukify/man1/
+ # we move the ukify hook itself, but keep 90-uki-copy.install in place,
+ # because there are other ways to generate UKIs w/o ukify, e.g. w/ mkinitcpio
+ mv "$pkgdir"/usr/lib/kernel/install.d/60-ukify.install
systemd-ukify/install.d
# manpages shipped with systemd-sysvcompat
rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8
@@ -332,10 +337,11 @@ package_systemd-ukify() {
optdepends=('python-pillow: Show the size of splash image'
'sbsigntools: Sign the embedded kernel')
- install -d -m0755 "$pkgdir"/usr/{lib,share/man}
+ install -d -m0755 "$pkgdir"/usr/{lib/kernel,share/man}
mv systemd-ukify/bin "$pkgdir"/usr/bin
mv systemd-ukify/systemd "$pkgdir"/usr/lib/systemd
mv systemd-ukify/man1 "$pkgdir"/usr/share/man/man1
+ mv systemd-ukify/lib/kernel/install.d "$pkgdir"/usr/lib/kernel/install.d
}
# vim:ft=sh syn=sh et sw=2:
=====================================
initcpio-install-systemd
=====================================
@@ -155,6 +155,8 @@ build() {
set -f
printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
)
+
+ [[ -f /etc/fstab.initramfs ]] && add_file "/etc/fstab.initramfs"
"/etc/fstab"
}
help() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/36e63f8b6a24f0b803cdfaafc7bc1a50ae8dc1d7...dc019e565bad32976cecd42aa4d7c786ff503c03
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/36e63f8b6a24f0b803cdfaafc7bc1a50ae8dc1d7...dc019e565bad32976cecd42aa4d7c786ff503c03
You're receiving this email because of your account on gitlab.archlinux.org.
