diff options
| author | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-03-05 01:39:10 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-03-05 01:39:10 -0700 |
| commit | 24c3e9048a58e95a8de1a12f9c3f59de29d85beb (patch) | |
| tree | 3d9a6a1d8358c04e20b57ad980b39181698cc923 | |
| parent | 7866bde5f913030c9001fca06b176b36b3d8cc56 (diff) | |
| parent | 39463f54fdc95b489bbfadf7945a70dc0ce748b7 (diff) | |
Merge branch 'lukeshu/systemd-pt2'
24 files changed, 1824 insertions, 1082 deletions
diff --git a/libre/systemd/.SRCINFO b/libre/systemd/.SRCINFO index f320087f2..0940b295b 100644 --- a/libre/systemd/.SRCINFO +++ b/libre/systemd/.SRCINFO @@ -1,11 +1,12 @@ pkgbase = systemd - pkgver = 253 - pkgrel = 1.parabola1 + pkgver = 255.4 + pkgrel = 2.parabola1 url = https://www.github.com/systemd/systemd arch = x86_64 arch = i686 arch = armv7h arch = ppc64le + license = LGPL-2.1-or-later makedepends = acl makedepends = cryptsetup makedepends = docbook-xsl @@ -48,20 +49,21 @@ pkgbase = systemd makedepends = llvm makedepends = curl makedepends = gnutls - options = strip - source = git+https://github.com/systemd/systemd-stable#tag=eb0f8fc41511dda1f9e0d19e830cc8c6668a2628?signed - source = git+https://github.com/systemd/systemd#tag=v253?signed + makedepends = python-pyelftools + makedepends = libpwquality + makedepends = qrencode + makedepends = python-pefile + conflicts = mkinitcpio<38-1 + source = git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed + source = git+https://github.com/systemd/systemd#tag=v255?signed source = 0001-Use-Arch-Linux-device-access-groups.patch - source = 0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch + source = 0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch source = 0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch source = 0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch source = 0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch source = 0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch - source = 0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch - source = 0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch - source = initcpio-hook-udev - source = initcpio-install-systemd - source = initcpio-install-udev + source = 0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch + source = 0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch source = parabola.conf source = loader.conf source = splash-parabola.bmp @@ -70,7 +72,8 @@ pkgbase = systemd source = 20-systemd-sysusers.hook source = 30-systemd-binfmt.hook source = 30-systemd-catalog.hook - source = 30-systemd-daemon-reload.hook + source = 30-systemd-daemon-reload-system.hook + source = 30-systemd-daemon-reload-user.hook source = 30-systemd-hwdb.hook source = 30-systemd-sysctl.hook source = 30-systemd-tmpfiles.hook @@ -83,42 +86,41 @@ pkgbase = systemd sha512sums = SKIP sha512sums = SKIP sha512sums = 3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e - sha512sums = 52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca - sha512sums = 0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25 - sha512sums = 0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2 - sha512sums = 9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3 - sha512sums = e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca - sha512sums = 6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017 - sha512sums = 73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd - sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 - sha512sums = c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b - sha512sums = a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6 + sha512sums = b01d28646bca80c33192a10728218427b95246f904d921d00451bd32673f6352aefe6a8168942e796f4b7d1682921cc5c6adb895c9d9cdc0365606bfd4eca391 + sha512sums = fb1f75ded29d635c9e746ce76a99ace4e79694eea6d6ec7e8a84d7700e92ee5698576b979e16d71316c3e9276f285e3db248f74e8e55a8cf719456f6abc362b1 + sha512sums = 03df948013f353e3fb6db745a01520c2dc8278b823e57178aca1c59786b81dd8a2e10e7f603e33028e1e9084a753cb7a09ebd4b4291dbdda30a16eba39628866 + sha512sums = 2e89361d6af47464b91a04dc4be7a941ff12894b56831702deb6063d8d386141ff04989d1ecb39dbc452d83caacd5830c8eb6b06350c4bee6ccd3383aa2b1c8f + sha512sums = 0b634f674468e6c859e7faff9bbf9d310a2c1feac2ceb4bfd5cb132e9b706f512908c1c905c72181395a5f0d0af40600e62ef46ce1ab534beb0b8d16aba0a2be + sha512sums = 819331360737c59bc6fa2ca681da16bdae599d83289d619da802c4ffff2fe3b72852b11d50caecc058c80022b6b5158c5309560670fa2c30c08e9bb14b7e0454 + sha512sums = eb4ca9b4460f19ac93885d8e22ae4e844d0798918d692d84333e4f1b5ae6fa28a2443d156e31202c1c05f97c3f61531a8822f1b0e66ccc00e20743b871322aa8 sha512sums = 70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8 sha512sums = 6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9 sha512sums = a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19 - sha512sums = a586f62b92268ae1e8a9310b02693548fb114292e1252953b4c9475d29e2817b5042a612f3b3ef09fb5b18126e2c3486ff49dd764d97644f0c510ae0200e075b + sha512sums = 3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886 sha512sums = 299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5 sha512sums = 0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7 sha512sums = 2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc - sha512sums = 63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254 + sha512sums = a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a + sha512sums = 190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d sha512sums = a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154 sha512sums = 9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de sha512sums = da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc sha512sums = a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3 sha512sums = 825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97 - makedepends_x86_64 = gnu-efi-libs - makedepends_i686 = gnu-efi-libs + makedepends_x86_64 = lib32-gcc-libs makedepends_i686 = pkgconf pkgname = systemd pkgdesc = system and service manager install = systemd.install - license = LGPL2.1 + license = LGPL-2.1-or-later + license = MIT-0 depends = bash depends = cryptsetup depends = libcryptsetup.so depends = dbus + depends = dbus-units depends = kbd depends = hwdata depends = systemd-libs @@ -126,20 +128,23 @@ pkgname = systemd depends = libelf depends = pcre2 depends = libssl.so - depends = systemd-common=253-1.parabola1 + depends = systemd-common=255.4-2.parabola1 depends = udev - optdepends = libmicrohttpd: remote journald capabilities + optdepends = libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote optdepends = quota-tools: kernel-level quota management optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries + optdepends = systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image optdepends = polkit: allow administration as unprivileged user - optdepends = python: Unified Kernel Image with ukify optdepends = curl: systemd-journal-upload, machinectl pull-tar and pull-raw optdepends = gnutls: systemd-journal-gatewayd and systemd-journal-remote + optdepends = qrencode: show QR codes + optdepends = iptables: firewall features optdepends = libbpf: support BPF programs + optdepends = libpwquality: check password quality optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token optdepends = libp11-kit: support PKCS#11 optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2 - provides = systemd-tools=253 + provides = systemd-tools=255.4 conflicts = systemd-tools replaces = systemd-tools backup = etc/pam.d/systemd-user @@ -160,7 +165,10 @@ pkgname = systemd pkgname = systemd-libs pkgdesc = systemd client libraries metapackage - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note + license = MIT-0 depends = libsystemd depends = libudev depends = nss-systemd @@ -173,29 +181,37 @@ pkgname = systemd-libs pkgname = systemd-resolvconf pkgdesc = systemd resolvconf replacement (for use with systemd-resolved) - license = LGPL2.1 depends = systemd provides = openresolv provides = resolvconf - conflicts = openresolv + conflicts = resolvconf replaces = notsystemd-resolvconf pkgname = systemd-sysvcompat pkgdesc = sysvinit compat for systemd - license = LGPL2.1 depends = systemd provides = init conflicts = sysvinit conflicts = init +pkgname = systemd-ukify + pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image + depends = binutils + depends = python-cryptography + depends = python-pefile + depends = systemd + optdepends = python-pillow: Show the size of splash image + optdepends = sbsigntools: Sign the embedded kernel + provides = ukify + pkgname = systemd-common pkgdesc = systemd files shared between split packages - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 depends = acl depends = audit depends = gcc-libs depends = glibc - depends = iptables depends = kmod depends = libacl.so depends = libaudit.so @@ -219,22 +235,28 @@ pkgname = systemd-common pkgname = systemd-udev pkgdesc = Userspace device file manager - license = GPL2 - depends = systemd-common=253-1.parabola1 + license = LGPL-2.1-or-later + license = GPL-2.0-or-later + depends = systemd-common=255.4-2.parabola1 depends = systemd-libudev depends = hwdata depends = kmod depends = libkmod.so depends = util-linux depends = zlib - provides = udev=253 + provides = udev=255.4 + conflicts = mkinitcpio<38-1 conflicts = udev replaces = udev + backup = etc/udev/iocost.conf backup = etc/udev/udev.conf pkgname = systemd-libsystemd pkgdesc = systemd client library - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note + license = MIT-0 depends = gcc-libs depends = glibc depends = libcap @@ -244,62 +266,82 @@ pkgname = systemd-libsystemd depends = xz depends = zstd provides = libsystemd.so - provides = libsystemd-standalone=253 + provides = libsystemd-standalone=255.4 + conflicts = mkinitcpio<38-1 conflicts = libsystemd-standalone replaces = libsystemd-standalone pkgname = systemd-libudev pkgdesc = systemd library for enumerating and introspecting local devices - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = gcc-libs depends = glibc depends = libcap depends = libcap.so provides = libudev.so - provides = libudev=253 + provides = libudev=255.4 + conflicts = mkinitcpio<38-1 conflicts = libudev replaces = libudev pkgname = systemd-nss-systemd pkgdesc = NSS module providing user and group resolution for dynamic users and groups - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = gcc-libs depends = glibc depends = libcap depends = libcap.so - provides = nss-systemd=253 + depends = libcrypt.so + depends = libcrypto.so + depends = libxcrypt + depends = openssl + provides = nss-systemd=255.4 + conflicts = mkinitcpio<38-1 conflicts = nss-systemd replaces = nss-systemd pkgname = systemd-nss-myhostname pkgdesc = NSS module providing hostname resolution for the locally configured system hostname - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = gcc-libs depends = glibc depends = libcap depends = libcap.so - provides = nss-myhostname=253 + provides = nss-myhostname=255.4 + conflicts = mkinitcpio<38-1 conflicts = nss-myhostname replaces = nss-myhostname pkgname = systemd-nss-mymachines pkgdesc = NSS module providing hostname resolution for local systemd-machined container instances - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = gcc-libs depends = glibc depends = libcap depends = libcap.so - provides = nss-mymachines=253 + provides = nss-mymachines=255.4 + conflicts = mkinitcpio<38-1 conflicts = nss-mymachines replaces = nss-mymachines pkgname = systemd-nss-resolve pkgdesc = NSS module providing hostname resolution via systemd-resolved - license = LGPL2.1 + license = LGPL-2.1-or-later + license = CC0-1.0 + license = GPL-2.0-or-later WITH Linux-syscall-note depends = gcc-libs depends = glibc depends = libcap depends = libcap.so - provides = nss-resolve=253 + provides = nss-resolve=255.4 + conflicts = mkinitcpio<38-1 conflicts = nss-resolve replaces = nss-resolve diff --git a/libre/systemd/0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/systemd/0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch new file mode 100644 index 000000000..0bd5b73e5 --- /dev/null +++ b/libre/systemd/0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch @@ -0,0 +1,53 @@ +From 17e2c00bf8323360dde0333497ea709cf47a399f Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Sat, 17 Dec 2016 00:56:43 -0500 +Subject: [PATCH 1/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of + "Linux Boot Manager" + +--- + man/bootctl.xml | 6 +++--- + src/boot/bootctl-install.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/man/bootctl.xml b/man/bootctl.xml +index 68e47747ff..841f7df36f 100644 +--- a/man/bootctl.xml ++++ b/man/bootctl.xml +@@ -475,10 +475,10 @@ + + <varlistentry> + <term><option>--efi-boot-option-description=</option></term> +- <listitem><para>Description of the entry added to the firmware's boot option list. Defaults to <literal>Linux ++ <listitem><para>Description of the entry added to the firmware's boot option list. Defaults to <literal>Systemd + Boot Manager</literal>.</para> + +- <para>Using the default entry name <literal>Linux Boot Manager</literal> is generally preferable as only ++ <para>Using the default entry name <literal>Systemd Boot Manager</literal> is generally preferable as only + one bootloader installed to a single ESP partition should be used to boot any number of OS installations + found on the various disks installed in the system. Specifically distributions should not use this flag + to install a branded entry in the boot option list. However in situations with multiple disks, each with +@@ -570,7 +570,7 @@ Available Boot Loaders on ESP: + File: └─/EFI/BOOT/BOOTX64.EFI (systemd-boot 251 + + Boot Loaders Listed in EFI Variables: +- Title: Linux Boot Manager ++ Title: Systemd Boot Manager + ID: 0x0001 + Status: active, boot-order + Partition: /dev/disk/by-partuuid/… +diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c +index bacbbb2939..0239fc200f 100644 +--- a/src/boot/bootctl-install.c ++++ b/src/boot/bootctl-install.c +@@ -639,7 +639,7 @@ static int remove_from_order(uint16_t slot) { + } + + static const char *pick_efi_boot_option_description(void) { +- return arg_efi_boot_option_description ?: "Linux Boot Manager"; ++ return arg_efi_boot_option_description ?: "Systemd Boot Manager"; + } + + static int install_variables( +-- +2.44.0 + diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch deleted file mode 100644 index 5da3767dc..000000000 --- a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch +++ /dev/null @@ -1,225 +0,0 @@ -From 1cc4d5dc91d40549520370131909f50887a25f12 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@parabola.nu> -Date: Wed, 25 May 2016 12:19:20 -0400 -Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux - -This is not a blind replacement of "Linux" with "GNU/Linux". In some -cases, "Linux" is (correctly) used to refer to just the kernel. In others, -it is in a string for which code must also be adjusted; these instances -are not included in this commit. ---- - man/daemon.xml | 4 ++-- - man/journald.conf.xml | 2 +- - man/machinectl.xml | 2 +- - man/sd-bus-errors.xml | 2 +- - man/sd_bus_error_add_map.xml | 2 +- - man/sd_uid_get_state.xml | 2 +- - man/systemd-detect-virt.xml | 4 ++-- - man/systemd-machine-id-setup.xml | 2 +- - man/systemd-resolved.service.xml | 6 +++--- - man/systemd.exec.xml | 2 +- - man/systemd.socket.xml | 2 +- - man/systemd.xml | 4 ++-- - 12 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/man/daemon.xml b/man/daemon.xml -index db95d2f75b..850b333ccf 100644 ---- a/man/daemon.xml -+++ b/man/daemon.xml -@@ -142,7 +142,7 @@ - <refsect2> - <title>New-Style Daemons</title> - -- <para>Modern services for Linux should be implemented as -+ <para>Modern services for GNU/Linux should be implemented as - new-style daemons. This makes it easier to supervise and control - them at runtime and simplifies their implementation.</para> - -@@ -287,7 +287,7 @@ - as detailed in the <ulink - url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB - Linux Standard Base Core Specification</ulink>. This method of -- activation is supported ubiquitously on Linux init systems, both -+ activation is supported ubiquitously on GNU/Linux init systems, both - old-style and new-style systems. Among other issues, SysV init - scripts have the disadvantage of involving shell scripts in the - boot process. New-style init systems generally employ updated -diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index 50c33e4792..a17389c7dc 100644 ---- a/man/journald.conf.xml -+++ b/man/journald.conf.xml -@@ -129,7 +129,7 @@ - <term><varname>SplitMode=</varname></term> - - <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or -- <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access -+ <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access - control is managed per file, and the journal daemon will assign users read access to their journal files. If - <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users, - and the nobody user) will each get their own journal files, and system users will log to the system journal. -diff --git a/man/machinectl.xml b/man/machinectl.xml -index 2ecbe0f0ab..dfba772eb3 100644 ---- a/man/machinectl.xml -+++ b/man/machinectl.xml -@@ -854,7 +854,7 @@ - <para>The <command>machinectl</command> tool operates on machines - and images whose names must be chosen following strict - rules. Machine names must be suitable for use as hostnames -- following a conservative subset of DNS and UNIX/Linux -+ following a conservative subset of DNS and GNU/Linux - semantics. Specifically, they must consist of one or more - non-empty label strings, separated by dots. No leading or trailing - dots are allowed. No sequences of multiple dots are allowed. The -diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml -index f3b1515c78..55ab2f8668 100644 ---- a/man/sd-bus-errors.xml -+++ b/man/sd-bus-errors.xml -@@ -100,7 +100,7 @@ - - <para>In addition to this list, in sd-bus, the special error - namespace <literal>System.Error.</literal> is used to map -- arbitrary Linux system errors (as defined by <citerefentry -+ arbitrary GNU/Linux system errors (as defined by <citerefentry - project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>) - to D-Bus errors and back. For example, the error - <constant>EUCLEAN</constant> is mapped to -diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml -index a49b554459..838c183855 100644 ---- a/man/sd_bus_error_add_map.xml -+++ b/man/sd_bus_error_add_map.xml -@@ -56,7 +56,7 @@ - - <para>The <function>sd_bus_error_add_map()</function> call may be - used to register additional mappings for converting D-Bus errors -- to Linux <varname>errno</varname>-style errors. The mappings -+ to GNU/Linux <varname>errno</varname>-style errors. The mappings - defined with this call are consulted by calls such as - <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry> - or -diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml -index 087a2d539d..1170f3ea0a 100644 ---- a/man/sd_uid_get_state.xml -+++ b/man/sd_uid_get_state.xml -@@ -163,7 +163,7 @@ - - <listitem><para>An input parameter was invalid (out of range, or <constant>NULL</constant>, - where that is not accepted). This is also returned if the passed user ID is -- <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on Linux. -+ <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux. - </para></listitem> - </varlistentry> - -diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml -index a92d83fe29..c03e08c61d 100644 ---- a/man/systemd-detect-virt.xml -+++ b/man/systemd-detect-virt.xml -@@ -155,12 +155,12 @@ - - <row> - <entry><varname>lxc</varname></entry> -- <entry>Linux container implementation by LXC</entry> -+ <entry>Container implementation by LXC</entry> - </row> - - <row> - <entry><varname>lxc-libvirt</varname></entry> -- <entry>Linux container implementation by libvirt</entry> -+ <entry>Container implementation by libvirt</entry> - </row> - - <row> -diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml -index f1695b6ddb..8bfb72f55d 100644 ---- a/man/systemd-machine-id-setup.xml -+++ b/man/systemd-machine-id-setup.xml -@@ -55,7 +55,7 @@ - and is different for every booted instance of the - VM.</para></listitem> - -- <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the -+ <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the - container, this is used to initialize the machine ID. For details, see the documentation of the <ulink - url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem> - -diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml -index 7003c36db7..50577843cb 100644 ---- a/man/systemd-resolved.service.xml -+++ b/man/systemd-resolved.service.xml -@@ -49,7 +49,7 @@ - API as defined by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related - resolver functions, including - <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. -- This API is widely supported, including beyond the Linux platform. In its current form it does not -+ This API is widely supported, including beyond the GNU/Linux platform. In its current form it does not - expose DNSSEC validation status information however, and is synchronous only. This API is backed by the - glibc Name Service Switch - (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). -@@ -321,7 +321,7 @@ search foobar.com barbar.com - <itemizedlist> - <listitem><para><command>systemd-resolved</command> maintains the - <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional -- Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also -+ GNU/Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also - contains a list of search domains that are in use by systemd-resolved. The list of search domains is - always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not - be used directly by applications, but only through a symlink from -@@ -337,7 +337,7 @@ search foobar.com barbar.com - </para></listitem> - - <listitem><para><command>systemd-resolved</command> maintains the -- <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux -+ <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux - programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept - up-to-date, containing information about all known DNS servers. Note the file format's limitations: it - does not know a concept of per-interface DNS servers and hence only contains system-wide DNS server -diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index bad21ceb0c..81abe6dcb2 100644 ---- a/man/systemd.exec.xml -+++ b/man/systemd.exec.xml -@@ -517,7 +517,7 @@ - <literal>-</literal>, except for the first character which must be one of a-z, A-Z and - <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The - user/group name must have at least one character, and at most 31. These restrictions are made in -- order to avoid ambiguities and to ensure user/group names and unit files remain portable among Linux -+ order to avoid ambiguities and to ensure user/group names and unit files remain portable among GNU/Linux - systems. For further details on the names accepted and the names warned about see <ulink - url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para> - -diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml -index 1f1f99800f..086cab483e 100644 ---- a/man/systemd.socket.xml -+++ b/man/systemd.socket.xml -@@ -292,7 +292,7 @@ - project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry> - for details). This expects a valid message queue name (i.e. beginning with - <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname> -- directive above. On Linux message queue descriptors are actually file descriptors and can be -+ directive above. On GNU/Linux message queue descriptors are actually file descriptors and can be - inherited between processes.</para></listitem> - </varlistentry> - -diff --git a/man/systemd.xml b/man/systemd.xml -index 1a68301d50..3aec7bc926 100644 ---- a/man/systemd.xml -+++ b/man/systemd.xml -@@ -37,7 +37,7 @@ - <refsect1> - <title>Description</title> - -- <para>systemd is a system and service manager for Linux operating systems. When run as first process on -+ <para>systemd is a system and service manager for GNU/Linux operating systems. When run as first process on - boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate - instances are started for logged-in users to start their services.</para> - -@@ -745,7 +745,7 @@ - - <para>When run as the system instance, systemd parses a number of options listed below. They can be - specified as kernel command line arguments which are parsed from a number of sources depending on the -- environment in which systemd is executed. If run inside a Linux container, these options are parsed from -+ environment in which systemd is executed. If run inside a container, these options are parsed from - the command line arguments passed to systemd itself, next to any of the command line options listed in - the Options section above. If run outside of Linux containers, these arguments are parsed from - <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable --- -2.43.0 - diff --git a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch index cc344fa32..86a70146c 100644 --- a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch +++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch @@ -1,21 +1,63 @@ -From 25576ff4a4b0bad85e6cbce92f72d5bf9af842ce Mon Sep 17 00:00:00 2001 +From 293085b65a8b11ce0be42c78e9deeaa36b4ff1ec Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:23:40 -0400 Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux" instead of "Linux" --- + man/check-os-release-simple.py | 2 +- + man/check-os-release.py | 2 +- + man/check-os-release.sh | 2 +- man/kernel-install.xml | 2 +- man/os-release.xml | 2 +- src/basic/os-util.c | 2 +- src/kernel-install/90-loaderentry.install.in | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 7 files changed, 7 insertions(+), 7 deletions(-) +diff --git a/man/check-os-release-simple.py b/man/check-os-release-simple.py +index ce73c77b14..9ad899a814 100644 +--- a/man/check-os-release-simple.py ++++ b/man/check-os-release-simple.py +@@ -4,7 +4,7 @@ + import platform + os_release = platform.freedesktop_os_release() + +-pretty_name = os_release.get('PRETTY_NAME', 'Linux') ++pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux') + print(f'Running on {pretty_name!r}') + + if 'fedora' in [os_release.get('ID', 'linux'), +diff --git a/man/check-os-release.py b/man/check-os-release.py +index 19b193ec76..373b77ed06 100644 +--- a/man/check-os-release.py ++++ b/man/check-os-release.py +@@ -29,7 +29,7 @@ def read_os_release(): + + os_release = dict(read_os_release()) + +-pretty_name = os_release.get('PRETTY_NAME', 'Linux') ++pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux') + print(f'Running on {pretty_name!r}') + + if 'debian' in [os_release.get('ID', 'linux'), +diff --git a/man/check-os-release.sh b/man/check-os-release.sh +index 12f7ee12cc..084647a38b 100644 +--- a/man/check-os-release.sh ++++ b/man/check-os-release.sh +@@ -4,7 +4,7 @@ + test -e /etc/os-release && os_release='/etc/os-release' || os_release='/usr/lib/os-release' + . "${os_release}" + +-echo "Running on ${PRETTY_NAME:-Linux}" ++echo "Running on ${PRETTY_NAME:-GNU/Linux}" + + if [ "${ID:-linux}" = "debian" ] || [ "${ID_LIKE#*debian*}" != "${ID_LIKE}" ]; then + echo "Looks like Debian!" diff --git a/man/kernel-install.xml b/man/kernel-install.xml -index e50aeee949..449529a31b 100644 +index c05176a5dc..df8b11b4ee 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml -@@ -105,7 +105,7 @@ +@@ -135,7 +135,7 @@ <filename>$BOOT/loader/entries/<replaceable>ENTRY-TOKEN</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>. The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former @@ -25,10 +67,10 @@ index e50aeee949..449529a31b 100644 <para>If <varname>$KERNEL_INSTALL_LAYOUT</varname> is not "bls", this plugin does nothing.</para></listitem> diff --git a/man/os-release.xml b/man/os-release.xml -index 113ef9fc18..f1c5fb5e56 100644 +index f2e0f3ecb7..4aad523fa4 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -183,7 +183,7 @@ +@@ -188,7 +188,7 @@ <listitem><para>A pretty operating system name in a format suitable for presentation to the user. May or may not contain a release code name or OS version of some kind, as suitable. If not @@ -38,10 +80,10 @@ index 113ef9fc18..f1c5fb5e56 100644 <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem> </varlistentry> diff --git a/src/basic/os-util.c b/src/basic/os-util.c -index bf844e5b7f..72a70e9314 100644 +index dbd067fd44..c03a76862d 100644 --- a/src/basic/os-util.c +++ b/src/basic/os-util.c -@@ -379,5 +379,5 @@ const char *os_release_pretty_name(const char *pretty_name, const char *name) { +@@ -438,5 +438,5 @@ const char *os_release_pretty_name(const char *pretty_name, const char *name) { * exists mostly to ensure we use the same logic wherever possible. */ return empty_to_null(pretty_name) ?: @@ -49,7 +91,7 @@ index bf844e5b7f..72a70e9314 100644 + empty_to_null(name) ?: "GNU/Linux"; } diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in -index e8e8cf37c3..47d4e30a9b 100755 +index a52dd812e4..00b4c6917d 100755 --- a/src/kernel-install/90-loaderentry.install.in +++ b/src/kernel-install/90-loaderentry.install.in @@ -66,7 +66,7 @@ elif [ -f /usr/lib/os-release ]; then @@ -62,5 +104,5 @@ index e8e8cf37c3..47d4e30a9b 100755 SORT_KEY="$IMAGE_ID" [ -z "$SORT_KEY" ] && SORT_KEY="$ID" -- -2.43.0 +2.44.0 diff --git a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch index 3753ad0d0..f781abadb 100644 --- a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch +++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch @@ -1,4 +1,4 @@ -From eaa1a0fe805213be13db72f1f7008340c41f53b4 Mon Sep 17 00:00:00 2001 +From 8984b62da1706d9d3288b4d51aabc75e90765f43 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:24:56 -0400 Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of @@ -9,10 +9,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/os-release.xml b/man/os-release.xml -index f1c5fb5e56..6352a5288a 100644 +index 4aad523fa4..17617520c2 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -139,7 +139,7 @@ +@@ -144,7 +144,7 @@ <term><varname>NAME=</varname></term> <listitem><para>A string identifying the operating system, without a version component, and @@ -22,5 +22,5 @@ index f1c5fb5e56..6352a5288a 100644 <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>. -- -2.43.0 +2.44.0 diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch index 5a73688ba..5ba77572d 100644 --- a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch +++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -1,4 +1,4 @@ -From 53e55360f909b054d2d389261bceb072dadd3d23 Mon Sep 17 00:00:00 2001 +From b249fe3f66b562b0490e978d8d2010fa7b1712fc Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:28:30 -0400 Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of @@ -7,14 +7,53 @@ Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of As far as I can tell, no code in this repository actually uses the ID field, so this is just a man page change. --- - man/os-release.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + man/check-os-release-simple.py | 2 +- + man/check-os-release.py | 2 +- + man/check-os-release.sh | 2 +- + man/os-release.xml | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +diff --git a/man/check-os-release-simple.py b/man/check-os-release-simple.py +index 9ad899a814..63ea424891 100644 +--- a/man/check-os-release-simple.py ++++ b/man/check-os-release-simple.py +@@ -7,6 +7,6 @@ os_release = platform.freedesktop_os_release() + pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux') + print(f'Running on {pretty_name!r}') + +-if 'fedora' in [os_release.get('ID', 'linux'), ++if 'fedora' in [os_release.get('ID', 'gnu-linux'), + *os_release.get('ID_LIKE', '').split()]: + print('Looks like Fedora!') +diff --git a/man/check-os-release.py b/man/check-os-release.py +index 373b77ed06..09aebd7a4f 100644 +--- a/man/check-os-release.py ++++ b/man/check-os-release.py +@@ -32,6 +32,6 @@ os_release = dict(read_os_release()) + pretty_name = os_release.get('PRETTY_NAME', 'GNU/Linux') + print(f'Running on {pretty_name!r}') + +-if 'debian' in [os_release.get('ID', 'linux'), ++if 'debian' in [os_release.get('ID', 'gnu-linux'), + *os_release.get('ID_LIKE', '').split()]: + print('Looks like Debian!') +diff --git a/man/check-os-release.sh b/man/check-os-release.sh +index 084647a38b..c02b4e6743 100644 +--- a/man/check-os-release.sh ++++ b/man/check-os-release.sh +@@ -6,6 +6,6 @@ test -e /etc/os-release && os_release='/etc/os-release' || os_release='/usr/lib/ + + echo "Running on ${PRETTY_NAME:-GNU/Linux}" + +-if [ "${ID:-linux}" = "debian" ] || [ "${ID_LIKE#*debian*}" != "${ID_LIKE}" ]; then ++if [ "${ID:-gnu-linux}" = "debian" ] || [ "${ID_LIKE#*debian*}" != "${ID_LIKE}" ]; then + echo "Looks like Debian!" + fi diff --git a/man/os-release.xml b/man/os-release.xml -index 6352a5288a..e0e1724a16 100644 +index 17617520c2..5e2569d289 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -152,7 +152,7 @@ +@@ -157,7 +157,7 @@ <listitem><para>A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_" and "-") identifying the operating system, excluding any version information and suitable for processing by scripts or usage in generated filenames. If not set, a default of @@ -24,5 +63,5 @@ index 6352a5288a..e0e1724a16 100644 <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem> -- -2.43.0 +2.44.0 diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch index 655045885..3e230ad57 100644 --- a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch +++ b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch @@ -1,18 +1,32 @@ -From d1a98f85e13118c4f6ab81f5d854429034629f9e Mon Sep 17 00:00:00 2001 +From 3219b6368eaa5c264d8d5ac1db0d6343abaaeb7f Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:31:20 -0400 Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux" instead of "linux" --- + man/hostname.xml | 2 +- src/resolve/resolved-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/man/hostname.xml b/man/hostname.xml +index a3dae72fd9..6beca463ec 100644 +--- a/man/hostname.xml ++++ b/man/hostname.xml +@@ -79,7 +79,7 @@ + <listitem><para>Otherwise, a fallback hostname configured at compilation time will be used + (<literal>&FALLBACK_HOSTNAME;</literal>).</para></listitem> + +- <!-- what about the "linux" fallback fallback? --> ++ <!-- what about the "gnu-linux" fallback? --> + </itemizedlist> + + <para>Effectively, the static hostname has higher priority than a transient hostname, which has higher diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index 6c6c98566f..be7830289b 100644 +index b52619e287..f380c23ec4 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c -@@ -370,7 +370,7 @@ static int determine_hostnames(char **full_hostname, char **llmnr_hostname, char +@@ -373,7 +373,7 @@ static int determine_hostnames(char **full_hostname, char **llmnr_hostname, char static char* fallback_hostname(void) { /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it @@ -21,7 +35,7 @@ index 6c6c98566f..be7830289b 100644 * instead. */ _cleanup_free_ char *n = get_default_hostname(); -@@ -378,7 +378,7 @@ static char* fallback_hostname(void) { +@@ -381,7 +381,7 @@ static char* fallback_hostname(void) { return NULL; if (is_localhost(n)) @@ -31,5 +45,5 @@ index 6c6c98566f..be7830289b 100644 return TAKE_PTR(n); } -- -2.43.0 +2.44.0 diff --git a/libre/systemd/0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch b/libre/systemd/0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch new file mode 100644 index 000000000..936be16e7 --- /dev/null +++ b/libre/systemd/0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch @@ -0,0 +1,38 @@ +From a54699c6754bab04fa27f3593b919ed0060b3957 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 25 May 2016 12:32:21 -0400 +Subject: [PATCH 6/7] FSDG: man/: Mention Parabola instead of Arch + +Ideally, we'd use FSDG distros for all of the examples, but doing so is +beyond my knowledge. Bill Auger and I have agreed to not remove examples +for non-FSDG distros that don't have a replacement. +--- + man/systemd-nspawn.xml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml +index e1e6d84fa3..afec5663ca 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -1832,13 +1832,13 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> + + <example> + <title>Boot a minimal +- <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title> ++ <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title> + +- <programlisting># pacstrap -c ~/arch-tree/ base +-# systemd-nspawn -bD ~/arch-tree/</programlisting> ++ <programlisting># pacstrap -c ~/parabola-tree/ base ++# systemd-nspawn -bD ~/parabola-tree/</programlisting> + +- <para>This installs a minimal Arch Linux distribution into the +- directory <filename>~/arch-tree/</filename> and then boots an OS ++ <para>This installs a minimal Parabola GNU/Linux-libre distribution into the ++ directory <filename>~/parabola-tree/</filename> and then boots an OS + in a namespace container in it.</para> + </example> + +-- +2.44.0 + diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch deleted file mode 100644 index 06818f5f8..000000000 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ /dev/null @@ -1,281 +0,0 @@ -From 68dc7c247a7e279c75d4be3407cf45d0a7d03c65 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@parabola.nu> -Date: Wed, 25 May 2016 12:32:21 -0400 -Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples - ---- - man/custom-entities.ent.in | 3 +-- - man/machinectl.xml | 4 ++- - man/os-release.xml | 50 ++++++++++++++++-------------------- - man/systemd-nspawn.xml | 52 ++++++++++++++++++++------------------ - 4 files changed, 53 insertions(+), 56 deletions(-) - -diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in -index 0376e0feb9..7b86b76ca2 100644 ---- a/man/custom-entities.ent.in -+++ b/man/custom-entities.ent.in -@@ -17,5 +17,4 @@ - <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}"> - <!ENTITY DEFAULT_TIMEOUT "{{DEFAULT_TIMEOUT_SEC}} s"> - <!ENTITY DEFAULT_USER_TIMEOUT "{{DEFAULT_USER_TIMEOUT_SEC}} s"> --<!ENTITY fedora_latest_version "36"> --<!ENTITY fedora_cloud_release "1.5"> -+<!ENTITY blag_latest_version "140"> -diff --git a/man/machinectl.xml b/man/machinectl.xml -index dfba772eb3..a2a08a025d 100644 ---- a/man/machinectl.xml -+++ b/man/machinectl.xml -@@ -939,11 +939,12 @@ - to open a shell in it.</para> - </example> - -+<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use. - <example> - <title>Download a Fedora image, set a root password in it, start - it as a service</title> - -- <programlisting># machinectl pull-raw --verify=no \ -+ <programlisting># machinectl pull-raw -&2D;verify=no \ - https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \ - Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 - # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 -@@ -958,6 +959,7 @@ - the machine started as system service. With the last command a - login prompt into the container is requested.</para> - </example> -+--> - - <example> - <title>Exports a container image as tar file</title> -diff --git a/man/os-release.xml b/man/os-release.xml -index e0e1724a16..4118b59d34 100644 ---- a/man/os-release.xml -+++ b/man/os-release.xml -@@ -142,7 +142,7 @@ - suitable for presentation to the user. If not set, a default of <literal>NAME=GNU/Linux</literal> may - be used.</para> - -- <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>. -+ <para>Examples: <literal>NAME=BLAG</literal>, <literal>NAME="gNewSense"</literal>. - </para></listitem> - </varlistentry> - -@@ -155,7 +155,7 @@ - <literal>ID=gnu-linux</literal> may be used. Note that even though this string may not include - characters that require shell quoting, quoting may nevertheless be used.</para> - -- <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem> -+ <para>Examples: <literal>ID=blag</literal>, <literal>ID=gnewsense</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -172,9 +172,9 @@ - closely the local operating system relates to the listed ones, starting with the closest. This - field is optional.</para> - -- <para>Examples: for an operating system with <literal>ID=centos</literal>, an assignment of -+ <para>Examples: for an operating system with <literal>ID=blag</literal>, an assignment of - <literal>ID_LIKE="rhel fedora"</literal> would be appropriate. For an operating system with -- <literal>ID=ubuntu</literal>, an assignment of <literal>ID_LIKE=debian</literal> is appropriate. -+ <literal>ID=gnewsense</literal>, an assignment of <literal>ID_LIKE=gnewsense</literal> is appropriate. - </para></listitem> - </varlistentry> - -@@ -185,7 +185,7 @@ - user. May or may not contain a release code name or OS version of some kind, as suitable. If not - set, a default of <literal>PRETTY_NAME="GNU/Linux"</literal> may be used</para> - -- <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem> -+ <para>Example: <literal>PRETTY_NAME="BLAG 210k (Spartakus)"</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -195,7 +195,7 @@ - url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as - proposed by the NIST. This field is optional.</para> - -- <para>Example: <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal></para></listitem> -+ <para>Example: <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal></para></listitem> - </varlistentry> - - <varlistentry> -@@ -238,7 +238,7 @@ - information, possibly including a release code name, and suitable for presentation to the - user. This field is optional.</para> - -- <para>Examples: <literal>VERSION=17</literal>, <literal>VERSION="17 (Beefy Miracle)"</literal>. -+ <para>Examples: <literal>VERSION=210k</literal>, <literal>VERSION="210k (Spartakus)"</literal>. - </para></listitem> - </varlistentry> - -@@ -250,7 +250,7 @@ - or release code name, and suitable for processing by scripts or usage in generated filenames. This - field is optional.</para> - -- <para>Examples: <literal>VERSION_ID=17</literal>, <literal>VERSION_ID=11.04</literal>. -+ <para>Examples: <literal>VERSION_ID=210k</literal>, <literal>VERSION_ID=7.0</literal>. - </para></listitem> - </varlistentry> - -@@ -346,7 +346,7 @@ - need to be referenced, it is recommended to provide an online landing page linking all available - resources.</para> - -- <para>Examples: <literal>HOME_URL="https://fedoraproject.org/"</literal>, -+ <para>Examples: <literal>HOME_URL="https://www.blagblagblag.org/"</literal>, - <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal>.</para></listitem> - </varlistentry> - -@@ -493,25 +493,19 @@ - <example> - <title><filename>os-release</filename> file for Fedora Workstation</title> - -- <programlisting>NAME=Fedora --VERSION="32 (Workstation Edition)" --ID=fedora --VERSION_ID=32 --PRETTY_NAME="Fedora 32 (Workstation Edition)" --ANSI_COLOR="0;38;2;60;110;180" --LOGO=fedora-logo-icon --CPE_NAME="cpe:/o:fedoraproject:fedora:32" --HOME_URL="https://fedoraproject.org/" --DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f32/system-administrators-guide/" --SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" --BUG_REPORT_URL="https://bugzilla.redhat.com/" --REDHAT_BUGZILLA_PRODUCT="Fedora" --REDHAT_BUGZILLA_PRODUCT_VERSION=32 --REDHAT_SUPPORT_PRODUCT="Fedora" --REDHAT_SUPPORT_PRODUCT_VERSION=32 --PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" --VARIANT="Workstation Edition" --VARIANT_ID=workstation</programlisting> -+ <programlisting>NAME=Parabola -+VERSION="rolling-release" -+ID=parabola -+ID_LIKE=arch -+VERSION_ID=rolling-release -+PRETTY_NAME="Parabola GNU/Linux-libre" -+ANSI_COLOR="1;35" -+LOGO=parabola-logo-icon -+CPE_NAME="cpe:/o:parabola:parabola:rolling-release" -+HOME_URL="https://www.parabola.nu/" -+DOCUMENTATION_URL="https://wiki.parabola.nu/" -+SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards" -+BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting> - </example> - - <example> -diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index e2c751692f..1b0ca65e4b 100644 ---- a/man/systemd-nspawn.xml -+++ b/man/systemd-nspawn.xml -@@ -1638,11 +1638,12 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> - <refsect1> - <title>Examples</title> - -+<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use. - <example> - <title>Download a - <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title> - -- <programlisting># machinectl pull-raw --verify=no \ -+ <programlisting># machinectl pull-raw -&2D;verify=no \ - https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \ - Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 - # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting> -@@ -1651,37 +1652,36 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> - <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> - and opens a shell in it.</para> - </example> -+--> - - <example> -- <title>Build and boot a minimal Fedora distribution in a container</title> -+ <title>Build and boot a minimal BLAG distribution in a container</title> - -- <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \ -- --repo=fedora --repo=updates --setopt=install_weak_deps=False install \ -- passwd dnf fedora-release vim-minimal systemd systemd-networkd --# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting> -+ <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \ -+ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \ -+ systemd passwd dnf blag-release vim-minimal glibc-minimal-langpack -+# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting> - -- <para>This installs a minimal Fedora distribution into the -- directory <filename index="false">/var/lib/machines/f&fedora_latest_version;</filename> -+ <para>This installs a minimal BLAG distribution into the -+ directory <filename index="false">/var/lib/machines/blag&blag_latest_version;</filename> - and then boots that OS in a namespace container. Because the installation - is located underneath the standard <filename>/var/lib/machines/</filename> - directory, it is also possible to start the machine using -- <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para> -+ <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para> - </example> - - <example> -- <title>Spawn a shell in a container of a minimal Debian unstable distribution</title> -+ <title>Spawn a shell in a container of a minimal gNewSense unstable distribution</title> - -- <programlisting># debootstrap unstable ~/debian-tree/ --# systemd-nspawn -D ~/debian-tree/</programlisting> -+ <programlisting># debootstrap ucclia ~/gnewsense-tree/ -+# systemd-nspawn -D ~/gnewsense-tree/</programlisting> - -- <para>This installs a minimal Debian unstable distribution into -- the directory <filename>~/debian-tree/</filename> and then -+ <para>This installs a minimal gNewSense Ucclia distribution into -+ the directory <filename>~/gnewsense-tree/</filename> and then - spawns a shell from this image in a namespace container.</para> - - <para><command>debootstrap</command> supports -- <ulink url="https://www.debian.org">Debian</ulink>, -- <ulink url="https://www.ubuntu.com">Ubuntu</ulink>, -- and <ulink url="https://www.tanglu.org">Tanglu</ulink> -+ <ulink url="http://www.gnewsense.org">gNewSense</ulink> - out of the box, so the same command can be used to install any of those. For other - distributions from the Debian family, a mirror has to be specified, see - <citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>. -@@ -1690,29 +1690,31 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> - - <example> - <title>Boot a minimal -- <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title> -+ <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title> - -- <programlisting># pacstrap -c ~/arch-tree/ base --# systemd-nspawn -bD ~/arch-tree/</programlisting> -+ <programlisting># pacstrap -c ~/parabola-tree/ base -+# systemd-nspawn -bD ~/parabola-tree/</programlisting> - -- <para>This installs a minimal Arch Linux distribution into the -- directory <filename>~/arch-tree/</filename> and then boots an OS -+ <para>This installs a minimal Parabola GNU/Linux-libre distribution into the -+ directory <filename>~/parabola-tree/</filename> and then boots an OS - in a namespace container in it.</para> - </example> - -+<!-- TODO: This example needs switched to an FSDG OS - <example> - <title>Install the - <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink> - rolling distribution</title> - -- <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \ -+ <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \ - https://download.opensuse.org/tumbleweed/repo/oss tumbleweed --# zypper --root=/var/lib/machines/tumbleweed refresh --# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \ -+# zypper -&2Droot=/var/lib/machines/tumbleweed refresh -+# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \ - systemd shadow zypper openSUSE-release vim - # systemd-nspawn -M tumbleweed passwd root - # systemd-nspawn -M tumbleweed -b</programlisting> - </example> -+--> - - <example> - <title>Boot into an ephemeral snapshot of the host system</title> --- -2.43.0 - diff --git a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch deleted file mode 100644 index 621a1181b..000000000 --- a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 93acf8d3c8c4650ada73119508d703fe1dcb142e Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@parabola.nu> -Date: Sat, 17 Dec 2016 00:56:43 -0500 -Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of - "Linux Boot Manager" - ---- - src/boot/bootctl-install.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/boot/bootctl-install.c b/src/boot/bootctl-install.c -index c795e75bc3..c373b30241 100644 ---- a/src/boot/bootctl-install.c -+++ b/src/boot/bootctl-install.c -@@ -635,7 +635,7 @@ static int remove_from_order(uint16_t slot) { - } - - static const char *pick_efi_boot_option_description(void) { -- return arg_efi_boot_option_description ?: "Linux Boot Manager"; -+ return arg_efi_boot_option_description ?: "Systemd Boot Manager"; - } - - static int install_variables( --- -2.43.0 - diff --git a/libre/systemd/0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch new file mode 100644 index 000000000..8cd366925 --- /dev/null +++ b/libre/systemd/0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -0,0 +1,1132 @@ +From 6ca2087afa3c6026472548ef3bf2280bbf0155c4 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 25 May 2016 12:19:20 -0400 +Subject: [PATCH 7/7] FSDG: man/: Refer to the operating system as GNU/Linux + +... and say "Linux kernel" when we explicitly mean the kernel and not the +whole system. + +I use the following command to search for instances I might want to replace: + + git grep -w Linux man|sed -E 's,(EFI/Linux|GNU/Linux|Fedora Linux|Arch Linux|User-mode Linux|Windows Subsystem for Linux|Linux[- ]kernel|Linux KVM|Linux container|Linux[_ ]Security[_ ]Module),,g'|grep Linux + +There are still a few false-positives in that output. +--- + man/bootup.xml | 2 +- + man/daemon.xml | 10 ++++----- + man/homectl.xml | 2 +- + man/hostnamectl.xml | 4 ++-- + man/journald.conf.xml | 2 +- + man/machinectl.xml | 4 ++-- + man/org.freedesktop.machine1.xml | 2 +- + man/org.freedesktop.resolve1.xml | 8 +++---- + man/org.freedesktop.systemd1.xml | 2 +- + man/os-release.xml | 2 +- + man/pam_systemd_home.xml | 2 +- + man/portablectl.xml | 2 +- + man/repart.d.xml | 2 +- + man/sd-bus-errors.xml | 2 +- + man/sd-event.xml | 2 +- + man/sd-id128.xml | 2 +- + man/sd_bus_error_add_map.xml | 2 +- + man/sd_bus_get_name_machine_id.xml | 2 +- + man/sd_event_add_io.xml | 2 +- + man/sd_event_set_signal_exit.xml | 2 +- + man/sd_id128_to_string.xml | 2 +- + man/sd_is_fifo.xml | 2 +- + man/sd_notify.xml | 2 +- + man/sd_uid_get_state.xml | 2 +- + man/systemd-analyze.xml | 2 +- + man/systemd-boot.xml | 2 +- + man/systemd-cgls.xml | 2 +- + man/systemd-cgtop.xml | 2 +- + man/systemd-cryptenroll.xml | 2 +- + man/systemd-detect-virt.xml | 8 +++---- + man/systemd-dissect.xml | 2 +- + man/systemd-machine-id-setup.xml | 2 +- + man/systemd-nspawn.xml | 6 ++--- + man/systemd-oomd.service.xml | 2 +- + man/systemd-pstore.service.xml | 4 ++-- + man/systemd-resolved.service.xml | 6 ++--- + man/systemd-sleep.conf.xml | 2 +- + man/systemd-stub.xml | 2 +- + man/systemd-sysext.xml | 2 +- + man/systemd-system.conf.xml | 2 +- + man/systemd.automount.xml | 2 +- + man/systemd.exec.xml | 36 +++++++++++++++--------------- + man/systemd.netdev.xml | 2 +- + man/systemd.network.xml | 8 +++---- + man/systemd.nspawn.xml | 4 ++-- + man/systemd.resource-control.xml | 2 +- + man/systemd.service.xml | 4 ++-- + man/systemd.slice.xml | 2 +- + man/systemd.socket.xml | 2 +- + man/systemd.swap.xml | 2 +- + man/systemd.xml | 6 ++--- + man/tmpfiles.d.xml | 6 ++--- + man/ukify.xml | 4 ++-- + 53 files changed, 97 insertions(+), 97 deletions(-) + +diff --git a/man/bootup.xml b/man/bootup.xml +index c872b13c68..ba0c564b39 100644 +--- a/man/bootup.xml ++++ b/man/bootup.xml +@@ -23,7 +23,7 @@ + <refsect1> + <title>Description</title> + +- <para>A number of different components are involved in the boot of a Linux system. Immediately after ++ <para>A number of different components are involved in the boot of a GNU/Linux system. Immediately after + power-up, the system firmware will do minimal hardware initialization, and hand control over to a boot + loader (e.g. + <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry> or +diff --git a/man/daemon.xml b/man/daemon.xml +index 8fa2506198..d091afa1d3 100644 +--- a/man/daemon.xml ++++ b/man/daemon.xml +@@ -47,7 +47,7 @@ + <listitem><para>Close all open file descriptors except + standard input, output, and error (i.e. the first three file + descriptors 0, 1, 2). This ensures that no accidentally passed +- file descriptor stays around in the daemon process. On Linux, ++ file descriptor stays around in the daemon process. On GNU/Linux, + this is best implemented by iterating through + <filename>/proc/self/fd</filename>, with a fallback of + iterating from file descriptor 3 to the value returned by +@@ -142,7 +142,7 @@ + <refsect2> + <title>New-Style Daemons</title> + +- <para>Modern services for Linux should be implemented as ++ <para>Modern services for GNU/Linux should be implemented as + new-style daemons. This makes it easier to supervise and control + them at runtime and simplifies their implementation.</para> + +@@ -285,7 +285,7 @@ + via SysV init scripts, as detailed in the <ulink + url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB + Linux Standard Base Core Specification</ulink>. This method of activation is supported ubiquitously on +- Linux init systems, both old-style and new-style systems. Among other issues, SysV init scripts have ++ GNU/Linux init systems, both old-style and new-style systems. Among other issues, SysV init scripts have + the disadvantage of involving shell scripts in the boot process. New-style init systems generally use + updated versions of activation, both during boot-up and during runtime and using more minimal service + description files.</para> +@@ -428,7 +428,7 @@ + often simpler or better alternatives, or they can be put together of combinations of the schemes above. + Example: Sometimes, it appears useful to start daemons or <filename>.socket</filename> units when a + specific IP address is configured on a network interface, because network sockets shall be bound to the +- address. However, an alternative to implement this is by utilizing the Linux ++ address. However, an alternative to implement this is by utilizing the Linux kernel + <constant>IP_FREEBIND</constant>/<constant>IPV6_FREEBIND</constant> socket option, as accessible via + <varname>FreeBind=yes</varname> in systemd socket files (see + <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry> for +@@ -436,7 +436,7 @@ + address, and hence allows bindings to a particular IP address before it actually becomes available, + making such an explicit dependency to the configured address redundant. Another often suggested trigger + for service activation is low system load. However, here too, a more convincing approach might be to +- make proper use of features of the operating system, in particular, the CPU or I/O scheduler of Linux. ++ make proper use of features of the operating system, in particular, the CPU or I/O scheduler of the Linux kernel. + Instead of scheduling jobs from userspace based on monitoring the OS scheduler, it is advisable to + leave the scheduling of processes to the OS scheduler itself. systemd provides fine-grained access to + the CPU and I/O schedulers. If a process executed by the service manager shall not negatively impact +diff --git a/man/homectl.xml b/man/homectl.xml +index 7fc7d5f012..7a56c66425 100644 +--- a/man/homectl.xml ++++ b/man/homectl.xml +@@ -430,7 +430,7 @@ + <varlistentry> + <term><option>--fido2-device=</option><replaceable>PATH</replaceable></term> + +- <listitem><para>Takes a path to a Linux <literal>hidraw</literal> device ++ <listitem><para>Takes a path to a Linux kernel <literal>hidraw</literal> device + (e.g. <filename>/dev/hidraw1</filename>), referring to a FIDO2 security token implementing the + <literal>hmac-secret</literal> extension that shall be able to unlock the user account. A random salt + value is generated on the host and passed to the FIDO2 device, which calculates a HMAC hash of the +diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml +index 85594b07d7..0061dbd20c 100644 +--- a/man/hostnamectl.xml ++++ b/man/hostnamectl.xml +@@ -47,7 +47,7 @@ + + <para>Note that the pretty hostname has little restrictions on the characters and length used, while the static and + transient hostnames are limited to the usually accepted characters of Internet domain names, and 64 characters at +- maximum (the latter being a Linux limitation).</para> ++ maximum (the latter being a Linux kernel limitation).</para> + + <para>Use + <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> to +@@ -86,7 +86,7 @@ + <para>The static and transient hostnames must each be either a single DNS label (a string composed of + 7-bit ASCII lower-case characters and no spaces or dots, limited to the format allowed for DNS domain + name labels), or a sequence of such labels separated by single dots that forms a valid DNS FQDN. The +- hostname must be at most 64 characters, which is a Linux limitation (DNS allows longer names).</para> ++ hostname must be at most 64 characters, which is a Linux kernel limitation (DNS allows longer names).</para> + + <xi:include href="version-info.xml" xpointer="v249"/></listitem> + </varlistentry> +diff --git a/man/journald.conf.xml b/man/journald.conf.xml +index e150d04dcf..1fb961de0a 100644 +--- a/man/journald.conf.xml ++++ b/man/journald.conf.xml +@@ -136,7 +136,7 @@ + <term><varname>SplitMode=</varname></term> + + <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or +- <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access ++ <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access + control is managed per file, and the journal daemon will assign users read access to their journal files. If + <literal>uid</literal>, all regular users (with UID outside the range of system users, dynamic service users, + and the nobody user) will each get their own journal files, and system users will log to the system journal. +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 1afd4313a7..b0e587a04d 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -72,7 +72,7 @@ + + <listitem><para>btrfs subvolumes containing OS trees, similar to regular directory trees.</para></listitem> + +- <listitem><para>Binary "raw" disk image files containing MBR or GPT partition tables and Linux file ++ <listitem><para>Binary "raw" disk image files containing MBR or GPT partition tables and GNU/Linux file + systems.</para></listitem> + + <listitem><para>Similarly, block devices containing MBR or GPT partition tables and file systems.</para></listitem> +@@ -972,7 +972,7 @@ + <para>The <command>machinectl</command> tool operates on machines + and images whose names must be chosen following strict + rules. Machine names must be suitable for use as hostnames +- following a conservative subset of DNS and UNIX/Linux ++ following a conservative subset of DNS and GNU/Linux + semantics. Specifically, they must consist of one or more + non-empty label strings, separated by dots. No leading or trailing + dots are allowed. No sequences of multiple dots are allowed. The +diff --git a/man/org.freedesktop.machine1.xml b/man/org.freedesktop.machine1.xml +index 1af77e0035..045e784f8b 100644 +--- a/man/org.freedesktop.machine1.xml ++++ b/man/org.freedesktop.machine1.xml +@@ -320,7 +320,7 @@ node /org/freedesktop/machine1 { + service that registers the machine, a class string, the PID of the leader process of the machine, an + optional root directory of the container, and an array of additional properties to use for the scope + registration. The virtual machine name must be suitable as a hostname, and hence should follow the usual +- DNS hostname rules, as well as the Linux hostname restrictions. Specifically, only 7 bit ASCII is ++ DNS hostname rules, as well as the Linux kernel hostname restrictions. Specifically, only 7 bit ASCII is + permitted, a maximum length of 64 characters is enforced, only characters from the set + <literal>a-zA-Z0-9-_.</literal> are allowed, the name may not begin with a dot, and it may not contain + two dots immediately following each other. Container and VM managers should ideally use the hostname +diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml +index f9cba4f612..71500d5f36 100644 +--- a/man/org.freedesktop.resolve1.xml ++++ b/man/org.freedesktop.resolve1.xml +@@ -256,7 +256,7 @@ node /org/freedesktop/resolve1 { + <title>Methods</title> + + <para><function>ResolveHostname()</function> takes a hostname and resolves it to one or more IP +- addresses. As parameters it takes the Linux network interface index to execute the query on, or 0 if ++ addresses. As parameters it takes the Linux kernel network interface index to execute the query on, or 0 if + it may be done on any suitable interface. The <varname>name</varname> parameter specifies the hostname + to resolve. Note that if required, IDNA conversion is applied to this name unless it is resolved via + LLMNR or MulticastDNS. The <varname>family</varname> parameter limits the results to a specific address +@@ -290,7 +290,7 @@ node /org/freedesktop/resolve1 { + + <para><function>ResolveRecord()</function> takes a DNS resource record (RR) type, class and name, and + retrieves the full resource record set (RRset), including the RDATA, for it. As parameter it takes the +- Linux network interface index to execute the query on, or <constant>0</constant> if it may be done on ++ Linux kernel network interface index to execute the query on, or <constant>0</constant> if it may be done on + any suitable interface. The <varname>name</varname> parameter specifies the RR domain name to look up + (no IDNA conversion is applied), followed by the 16-bit class and type fields (which may be + ANY). Finally, a <varname>flags</varname> field may be passed in to alter behaviour of the look-up (see +@@ -314,7 +314,7 @@ node /org/freedesktop/resolve1 { + service metadata. The primary benefit of using this method over <function>ResolveRecord()</function> + specifying the <constant class="dns">SRV</constant> type is that it will resolve the + <constant class="dns">SRV</constant> and <constant class="dns">TXT</constant> RRs as well as the +- hostnames referenced in the SRV in a single operation. As parameters it takes a Linux network interface ++ hostnames referenced in the SRV in a single operation. As parameters it takes a Linux kernel network interface + index, a service name, a service type and a service domain. This method may be invoked in three + different modes:</para> + +@@ -745,7 +745,7 @@ node /org/freedesktop/resolve1/link/_1 { + + <!--End of Autogenerated section--> + +- <para>For each Linux network interface a "Link" object is created which exposes per-link DNS ++ <para>For each Linux kernel network interface a "Link" object is created which exposes per-link DNS + configuration and state. Use <function>GetLink()</function> on the Manager interface to retrieve the + object path for a link object given the network interface index (see above).</para> + +diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml +index 6008ba00a3..caf2b9df9e 100644 +--- a/man/org.freedesktop.systemd1.xml ++++ b/man/org.freedesktop.systemd1.xml +@@ -1266,7 +1266,7 @@ node /org/freedesktop/systemd1 { + + <para><function>GetUnitByPID()</function> may be used to get the unit object path of the unit a process + ID belongs to. It takes a UNIX PID and returns the object path. The PID must refer to an existing system process. +- <function>GetUnitByPIDFD()</function> may be used to query with a Linux PIDFD (see: ++ <function>GetUnitByPIDFD()</function> may be used to query with a Linux kernel PIDFD (see: + <citerefentry><refentrytitle>pidfd_open</refentrytitle><manvolnum>2</manvolnum></citerefentry>) instead + of a PID, which is safer as UNIX PIDs can be recycled. The latter method returns the unit id and the + invocation id together with the unit object path.</para> +diff --git a/man/os-release.xml b/man/os-release.xml +index 5e2569d289..461a5676e7 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -456,7 +456,7 @@ + present and no other configuration source specifies the hostname. Must be either a single DNS label + (a string composed of 7-bit ASCII lower-case characters and no spaces or dots, limited to the + format allowed for DNS domain name labels), or a sequence of such labels separated by single dots +- that forms a valid DNS FQDN. The hostname must be at most 64 characters, which is a Linux ++ that forms a valid DNS FQDN. The hostname must be at most 64 characters, which is a Linux kernel + limitation (DNS allows longer names).</para> + + <para>See <citerefentry><refentrytitle>org.freedesktop.hostname1</refentrytitle><manvolnum>5</manvolnum></citerefentry> +diff --git a/man/pam_systemd_home.xml b/man/pam_systemd_home.xml +index dd28de1176..6e09168bf1 100644 +--- a/man/pam_systemd_home.xml ++++ b/man/pam_systemd_home.xml +@@ -106,7 +106,7 @@ + the encrypted data), <option>account</option> (because users with + <filename>systemd-homed.service</filename> user accounts are described in a <ulink + url="https://systemd.io/USER_RECORD/">JSON user record</ulink> and may be configured in more detail than +- in the traditional Linux user database), <option>session</option> (because user sessions must be tracked ++ in the traditional GNU/Linux user database), <option>session</option> (because user sessions must be tracked + in order to implement automatic release when the last session of the user is gone), + <option>password</option> (to change the encryption password — also used for user authentication — + through PAM).</para> +diff --git a/man/portablectl.xml b/man/portablectl.xml +index 03ca65e0cb..157404e8b2 100644 +--- a/man/portablectl.xml ++++ b/man/portablectl.xml +@@ -58,7 +58,7 @@ + + <listitem><para>btrfs subvolumes containing OS trees, similar to normal directory trees.</para></listitem> + +- <listitem><para>Binary "raw" disk images containing MBR or GPT partition tables and Linux file system ++ <listitem><para>Binary "raw" disk images containing MBR or GPT partition tables and GNU/Linux file system + partitions. (These must be regular files, with the <filename>.raw</filename> suffix.)</para></listitem> + </itemizedlist> + +diff --git a/man/repart.d.xml b/man/repart.d.xml +index 79908a0805..b9f88f63fc 100644 +--- a/man/repart.d.xml ++++ b/man/repart.d.xml +@@ -139,7 +139,7 @@ + + <row> + <entry><constant>linux-generic</constant></entry> +- <entry>Generic Linux file system partition</entry> ++ <entry>Generic GNU/Linux file system partition</entry> + </row> + + <row> +diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml +index 25e3913162..8198e952f7 100644 +--- a/man/sd-bus-errors.xml ++++ b/man/sd-bus-errors.xml +@@ -110,7 +110,7 @@ + + <para>In addition to this list, in sd-bus, the special error + namespace <literal>System.Error.</literal> is used to map +- arbitrary Linux system errors (as defined by <citerefentry ++ arbitrary GNU/Linux system errors (as defined by <citerefentry + project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>) + to D-Bus errors and back. For example, the error + <constant>EUCLEAN</constant> is mapped to +diff --git a/man/sd-event.xml b/man/sd-event.xml +index 276770f61d..7f1e5e2035 100644 +--- a/man/sd-event.xml ++++ b/man/sd-event.xml +@@ -36,7 +36,7 @@ + + <para><filename>sd-event.h</filename> is part of + <citerefentry><refentrytitle>libsystemd</refentrytitle><manvolnum>3</manvolnum></citerefentry> and +- provides a generic event loop implementation, based on Linux <citerefentry ++ provides a generic event loop implementation, based on Linux kernel <citerefentry + project='man-pages'><refentrytitle>epoll</refentrytitle><manvolnum>7</manvolnum></citerefentry>. + </para> + +diff --git a/man/sd-id128.xml b/man/sd-id128.xml +index d264220b0b..48d2a1befb 100644 +--- a/man/sd-id128.xml ++++ b/man/sd-id128.xml +@@ -193,7 +193,7 @@ int main(int argc, char **argv) { + "<ulink url="https://en.wikipedia.org/wiki/Universally_unique_identifier#Format">UUID canonical representation</ulink>". + They format the string based on <ulink + url="https://tools.ietf.org/html/rfc4122">RFC4122</ulink> Variant 1 rules, i.e. converting from Big +- Endian byte order. This matches behaviour of most other Linux userspace infrastructure. It's probably ++ Endian byte order. This matches behaviour of most other GNU/Linux userspace infrastructure. It's probably + best to avoid UUIDs of other variants, in order to avoid unnecessary ambiguities. All 128-bit IDs + generated by the sd-id128 APIs strictly conform to Variant 1 Version 4 UUIDs, as per RFC 4122.</para> + +diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml +index 6676455489..5a68d89d8a 100644 +--- a/man/sd_bus_error_add_map.xml ++++ b/man/sd_bus_error_add_map.xml +@@ -51,7 +51,7 @@ + + <para>The <function>sd_bus_error_add_map()</function> call may be + used to register additional mappings for converting D-Bus errors +- to Linux <varname>errno</varname>-style errors. The mappings ++ to GNU/Linux <varname>errno</varname>-style errors. The mappings + defined with this call are consulted by calls such as + <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry> + or +diff --git a/man/sd_bus_get_name_machine_id.xml b/man/sd_bus_get_name_machine_id.xml +index 64019c9856..ac29eb3fdc 100644 +--- a/man/sd_bus_get_name_machine_id.xml ++++ b/man/sd_bus_get_name_machine_id.xml +@@ -40,7 +40,7 @@ + <para><function>sd_bus_get_name_machine_id()</function> retrieves the D-Bus machine identity of the + machine that the bus client identified by <parameter>name</parameter> is running on. Internally, it calls + the <function>GetMachineId</function> method of the <constant>org.freedesktop.DBus.Peer</constant> +- interface. The D-Bus machine identity is a 128-bit UUID. On Linux systems running systemd, this ++ interface. The D-Bus machine identity is a 128-bit UUID. On GNU/Linux systems running systemd, this + corresponds to the contents of <filename>/etc/machine-id</filename>. On success, the machine identity is + stored in <parameter>machine</parameter>.</para> + </refsect1> +diff --git a/man/sd_event_add_io.xml b/man/sd_event_add_io.xml +index da0fa58227..ac095fb2d4 100644 +--- a/man/sd_event_add_io.xml ++++ b/man/sd_event_add_io.xml +@@ -104,7 +104,7 @@ + object is specified in the <parameter>event</parameter> parameter, the event source object is returned in + the <parameter>source</parameter> parameter. The <parameter>fd</parameter> parameter takes the UNIX file + descriptor to watch, which may refer to a socket, a FIFO, a message queue, a serial connection, a +- character device, or any other file descriptor compatible with Linux <citerefentry ++ character device, or any other file descriptor compatible with Linux kernel <citerefentry + project='man-pages'><refentrytitle>epoll</refentrytitle><manvolnum>7</manvolnum></citerefentry>. The + <parameter>events</parameter> parameter takes a bit mask of events to watch for, a combination of the + following event flags: <constant>EPOLLIN</constant>, <constant>EPOLLOUT</constant>, +diff --git a/man/sd_event_set_signal_exit.xml b/man/sd_event_set_signal_exit.xml +index 1ac208ea85..6ab1503275 100644 +--- a/man/sd_event_set_signal_exit.xml ++++ b/man/sd_event_set_signal_exit.xml +@@ -49,7 +49,7 @@ + <constant>SIGINT</constant> and <constant>SIGTERM</constant>. If specified as false, it will no + longer. When this functionality is turned off the calling thread's signal mask is restored to match the + state before it was turned on, for the two signals. By default the two signals are not handled by the +- event loop, and Linux' default signal handling for them is in effect.</para> ++ event loop, and the Linux kernel's default signal handling for them is in effect.</para> + + <para>It's customary for UNIX programs to exit on either of these two signals, hence it's typically a + good idea to enable this functionality for the main event loop of a program.</para> +diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml +index da44a0dcdd..c3323e0f97 100644 +--- a/man/sd_id128_to_string.xml ++++ b/man/sd_id128_to_string.xml +@@ -83,7 +83,7 @@ + + <para>Note that when formatting and parsing 36 character UUIDs this is done strictly in Big Endian byte order, + i.e. according to <ulink url="https://tools.ietf.org/html/rfc4122">RFC4122</ulink> Variant 1 rules, even +- if the UUID encodes a different variant. This matches behaviour in various other Linux userspace ++ if the UUID encodes a different variant. This matches behaviour in various other GNU/Linux userspace + tools. It's probably wise to avoid UUIDs of other variant types.</para> + + <para>For more information about the <literal>sd_id128_t</literal> type see +diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml +index a00a2cc1b8..238f9a90c4 100644 +--- a/man/sd_is_fifo.xml ++++ b/man/sd_is_fifo.xml +@@ -140,7 +140,7 @@ + the <parameter>path</parameter> parameter is + <constant>NULL</constant>. For normal file system + <constant>AF_UNIX</constant> sockets, set the +- <parameter>length</parameter> parameter to 0. For Linux abstract ++ <parameter>length</parameter> parameter to 0. For Linux kernel abstract + namespace sockets, set the <parameter>length</parameter> to the + size of the address, including the initial 0 byte, and set the + <parameter>path</parameter> to the initial 0 byte of the socket +diff --git a/man/sd_notify.xml b/man/sd_notify.xml +index 7c32a22bc9..9e25a42aee 100644 +--- a/man/sd_notify.xml ++++ b/man/sd_notify.xml +@@ -474,7 +474,7 @@ + <para>These functions send a single datagram with the state string as payload to the socket referenced in + the <varname>$NOTIFY_SOCKET</varname> environment variable. If the first character of + <varname>$NOTIFY_SOCKET</varname> is <literal>/</literal> or <literal>@</literal>, the string is +- understood as an <constant>AF_UNIX</constant> or Linux abstract namespace socket (respectively), and in ++ understood as an <constant>AF_UNIX</constant> or Linux kernel abstract namespace socket (respectively), and in + both cases the datagram is accompanied by the process credentials of the sending service, using + SCM_CREDENTIALS. If the string starts with <literal>vsock:</literal> then the string is understood as an + <constant>AF_VSOCK</constant> address, which is useful for hypervisors/VMMs or other processes on the +diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml +index 4a78ed9065..56be9d8e0b 100644 +--- a/man/sd_uid_get_state.xml ++++ b/man/sd_uid_get_state.xml +@@ -181,7 +181,7 @@ + + <listitem><para>An input parameter was invalid (out of range, or <constant>NULL</constant>, + where that is not accepted). This is also returned if the passed user ID is +- <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on Linux. ++ <constant>0xFFFF</constant> or <constant>0xFFFFFFFF</constant>, which are undefined on GNU/Linux. + </para></listitem> + </varlistentry> + +diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml +index 35ad8435f4..7a23d33d3c 100644 +--- a/man/systemd-analyze.xml ++++ b/man/systemd-analyze.xml +@@ -431,7 +431,7 @@ DATAERR 65 BSD + <refsect2> + <title><command>systemd-analyze capability <optional><replaceable>CAPABILITY</replaceable>...</optional></command></title> + +- <para>This command prints a list of Linux capabilities along with their numeric IDs. See <citerefentry ++ <para>This command prints a list of Linux kernel capabilities along with their numeric IDs. See <citerefentry + project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> + for details. If no argument is specified the full list of capabilities known to the service manager and + the kernel is shown. Capabilities defined by the kernel but not known to the service manager are shown +diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml +index 2b0ea9be34..3df3661040 100644 +--- a/man/systemd-boot.xml ++++ b/man/systemd-boot.xml +@@ -111,7 +111,7 @@ + + <para><citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry> + may be used as UEFI boot stub for executed kernels, which is useful to show graphical boot splashes +- before transitioning into the Linux world. It is also capable of automatically picking up auxiliary ++ before transitioning into the Linux kernel's world. It is also capable of automatically picking up auxiliary + credential files (for boot parameterization) and system extension images, as companion files to the + booted kernel images.</para> + </refsect1> +diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml +index 27332c5d31..a843194b52 100644 +--- a/man/systemd-cgls.xml ++++ b/man/systemd-cgls.xml +@@ -39,7 +39,7 @@ + <title>Description</title> + + <para><command>systemd-cgls</command> recursively shows the +- contents of the selected Linux control group hierarchy in a tree. ++ contents of the selected Linux kernel control group hierarchy in a tree. + If arguments are specified, shows all member processes of the + specified control groups plus all their subgroups and their + members. The control groups may either be specified by their full +diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml +index ddad82e2b3..e515f417d2 100644 +--- a/man/systemd-cgtop.xml ++++ b/man/systemd-cgtop.xml +@@ -33,7 +33,7 @@ + <title>Description</title> + + <para><command>systemd-cgtop</command> shows the top control +- groups of the local Linux control group hierarchy, ordered by ++ groups of the local Linux kernel control group hierarchy, ordered by + their CPU, memory, or disk I/O load. The display is refreshed in + regular intervals (by default every 1s), similar in style to + <citerefentry project='man-pages'><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>. +diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml +index 8fd885cb26..d114ec5f0a 100644 +--- a/man/systemd-cryptenroll.xml ++++ b/man/systemd-cryptenroll.xml +@@ -153,7 +153,7 @@ + <entry>9</entry> + <entry>kernel-initrd</entry> + <entry>The Linux kernel measures all initrds it receives into this PCR.</entry> +- <!-- Strictly speaking only Linux >= 5.17 using the LOAD_FILE2 protocol, see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f046fff8bc4c4d8f8a478022e76e40b818f692df --> ++ <!-- Strictly speaking only Linux kernel >= 5.17 using the LOAD_FILE2 protocol, see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f046fff8bc4c4d8f8a478022e76e40b818f692df --> + </row> + + <row> +diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml +index e1caa4fc26..6e35e657ee 100644 +--- a/man/systemd-detect-virt.xml ++++ b/man/systemd-detect-virt.xml +@@ -160,12 +160,12 @@ + + <row> + <entry><varname>lxc</varname></entry> +- <entry>Linux container implementation by LXC</entry> ++ <entry>Container implementation by LXC</entry> + </row> + + <row> + <entry><varname>lxc-libvirt</varname></entry> +- <entry>Linux container implementation by libvirt</entry> ++ <entry>Container implementation by libvirt</entry> + </row> + + <row> +@@ -212,8 +212,8 @@ + conjunction, only the latter will be identified (unless + <option>--vm</option> is passed).</para> + <para> Windows Subsystem for Linux is not a Linux container, +- but an environment for running Linux userspace applications on +- top of the Windows kernel using a Linux-compatible interface. ++ but an environment for running GNU/Linux userspace applications on ++ top of the Windows kernel using a Linux-kernel-compatible interface. + WSL is categorized as a container for practical purposes. + Multiple WSL environments share the same kernel and services + should generally behave like when being run in a container.</para> +diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml +index a17111cb7d..92d1c86b88 100644 +--- a/man/systemd-dissect.xml ++++ b/man/systemd-dissect.xml +@@ -97,7 +97,7 @@ + partition only. (This partition is assumed to contain the root file system of the OS.)</para></listitem> + </orderedlist> + +- <para>OS images may use any kind of Linux-supported file systems. In addition they may make use of LUKS ++ <para>OS images may use any kind of Linux-kernel-supported file systems. In addition they may make use of LUKS + disk encryption, and contain Verity integrity information. Note that qualifying OS images may be booted + with <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s + <option>--image=</option> switch, and be used as root file system for system service using the +diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml +index d1a77bdf34..d34c53d580 100644 +--- a/man/systemd-machine-id-setup.xml ++++ b/man/systemd-machine-id-setup.xml +@@ -55,7 +55,7 @@ + and is different for every booted instance of the + VM.</para></listitem> + +- <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the ++ <listitem><para>Similarly, if run inside a container environment and a UUID is configured for the + container, this is used to initialize the machine ID. For details, see the documentation of the <ulink + url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem> + +diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml +index afec5663ca..b164b72b6f 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -57,7 +57,7 @@ + + <para>In contrast to <citerefentry + project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> <command>systemd-nspawn</command> +- may be used to boot full Linux-based operating systems in a container.</para> ++ may be used to boot full Linux-kernel-based operating systems in a container.</para> + + <para><command>systemd-nspawn</command> limits access to various kernel interfaces in the container to read-only, + such as <filename>/sys/</filename>, <filename>/proc/sys/</filename> or <filename>/sys/fs/selinux/</filename>. The +@@ -1000,7 +1000,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> + <para>Note that <option>--network-veth</option> is the default if the + <filename>systemd-nspawn@.service</filename> template unit file is used.</para> + +- <para>Note that on Linux network interface names may have a length of 15 characters at maximum, while ++ <para>Note that on the Linux kernel, network interface names may have a length of 15 characters at maximum, while + container names may have a length up to 64 characters. As this option derives the host-side interface + name from the container name the name is possibly truncated. Thus, care needs to be taken to ensure + that interface names remain unique in this case, or even better container names are generally not +@@ -1043,7 +1043,7 @@ After=sys-subsystem-net-devices-ens1.device</programlisting> + as argument. Note that <option>--network-bridge=</option> implies <option>--network-veth</option>. If + this option is used, the host side of the Ethernet link will use the <literal>vb-</literal> prefix + instead of <literal>ve-</literal>. Regardless of the used naming prefix the same network interface +- name length limits imposed by Linux apply, along with the complications this creates (for details see ++ name length limits imposed by the Linux kernel apply, along with the complications this creates (for details see + above).</para> + + <para>As with <option>--network-interface=</option>, the underlying bridge network interface must +diff --git a/man/systemd-oomd.service.xml b/man/systemd-oomd.service.xml +index d8ecfde8eb..73fd43a270 100644 +--- a/man/systemd-oomd.service.xml ++++ b/man/systemd-oomd.service.xml +@@ -68,7 +68,7 @@ + is set to <constant>true</constant> in + <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> + +- <para>The kernel must be compiled with PSI support. This is available in Linux 4.20 and above.</para> ++ <para>The kernel must be compiled with PSI support. This is available in Linux kernel 4.20 and above.</para> + + <para>It is highly recommended for the system to have swap enabled for <command>systemd-oomd</command> to + function optimally. With swap enabled, the system spends enough time swapping pages to let +diff --git a/man/systemd-pstore.service.xml b/man/systemd-pstore.service.xml +index 66ad5572c8..8362314245 100644 +--- a/man/systemd-pstore.service.xml ++++ b/man/systemd-pstore.service.xml +@@ -30,11 +30,11 @@ + <refsect1> + <title>Description</title> + <para><filename>systemd-pstore.service</filename> is a system service that archives the +- contents of the Linux persistent storage filesystem, pstore, to other storage, ++ contents of the Linux kernel persistent storage filesystem, pstore, to other storage, + thus preserving the existing information contained in the pstore, and clearing + pstore storage for future error events.</para> + +- <para>Linux provides a persistent storage file system, pstore, that can store error records when the ++ <para>The Linux kernel provides a persistent storage file system, pstore, that can store error records when the + kernel dies (or reboots or powers-off). These records in turn can be referenced to debug kernel problems + (currently the kernel stores the tail of the kernel log, which also contains a stack backtrace, into + pstore).</para> +diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml +index 85c857dc2f..536ed96391 100644 +--- a/man/systemd-resolved.service.xml ++++ b/man/systemd-resolved.service.xml +@@ -50,7 +50,7 @@ + API as defined by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related + resolver functions, including + <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. +- This API is widely supported, including beyond the Linux platform. In its current form it does not ++ This API is widely supported, including beyond the GNU/Linux platform. In its current form it does not + expose DNSSEC validation status information however, and is synchronous only. This API is backed by the + glibc Name Service Switch + (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). +@@ -335,7 +335,7 @@ search foobar.com barbar.com + <itemizedlist> + <listitem><para><command>systemd-resolved</command> maintains the + <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional +- Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also ++ GNU/Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also + contains a list of search domains that are in use by systemd-resolved. The list of search domains is + always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not + be used directly by applications, but only through a symlink from +@@ -351,7 +351,7 @@ search foobar.com barbar.com + </para></listitem> + + <listitem><para><command>systemd-resolved</command> maintains the +- <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux ++ <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux + programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept + up-to-date, containing information about all known DNS servers. Note the file format's limitations: it + does not know a concept of per-interface DNS servers and hence only contains system-wide DNS server +diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml +index 7c2adb068f..7db88f7aca 100644 +--- a/man/systemd-sleep.conf.xml ++++ b/man/systemd-sleep.conf.xml +@@ -224,7 +224,7 @@ + <title>Example: freeze</title> + + <para>Example: to exploit the <quote>freeze</quote> mode added +- in Linux 3.9, one can use <command>systemctl suspend</command> ++ in Linux kernel 3.9, one can use <command>systemctl suspend</command> + with + <programlisting>[Sleep] + SuspendState=freeze</programlisting></para> +diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml +index 6e853336c2..88fe682e5b 100644 +--- a/man/systemd-stub.xml ++++ b/man/systemd-stub.xml +@@ -44,7 +44,7 @@ + attached to a Linux kernel binary image, and is a piece of code that runs in the UEFI firmware + environment before transitioning into the Linux kernel environment. The UEFI boot stub ensures a Linux + kernel is executable as regular UEFI binary, and is able to do various preparations before switching the +- system into the Linux world.</para> ++ system into the Linux kernel's world.</para> + + <para>The UEFI boot stub looks for various resources for the kernel invocation inside the UEFI PE binary + itself. This allows combining various resources inside a single PE binary image (usually called "Unified +diff --git a/man/systemd-sysext.xml b/man/systemd-sysext.xml +index 76076931d5..a0e0ff78c7 100644 +--- a/man/systemd-sysext.xml ++++ b/man/systemd-sysext.xml +@@ -83,7 +83,7 @@ + <listitem><para>Plain directories or btrfs subvolumes containing the OS tree</para></listitem> + <listitem><para>Disk images with a GPT disk label, following the <ulink + url="https://uapi-group.org/specifications/specs/discoverable_partitions_specification">Discoverable Partitions Specification</ulink></para></listitem> +- <listitem><para>Disk images lacking a partition table, with a naked Linux file system (e.g. erofs, ++ <listitem><para>Disk images lacking a partition table, with a naked GNU/Linux file system (e.g. erofs, + squashfs or ext4)</para></listitem> + </orderedlist> + +diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml +index 3c06b65f93..276d699b3b 100644 +--- a/man/systemd-system.conf.xml ++++ b/man/systemd-system.conf.xml +@@ -561,7 +561,7 @@ + <varlistentry> + <term><varname>DefaultOOMPolicy=</varname></term> + +- <listitem><para>Configure the default policy for reacting to processes being killed by the Linux ++ <listitem><para>Configure the default policy for reacting to processes being killed by the Linux kernel + Out-Of-Memory (OOM) killer or <command>systemd-oomd</command>. This may be used to pick a global default for the per-unit + <varname>OOMPolicy=</varname> setting. See + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> +diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml +index 0bbd4e8ae7..4bfad710f8 100644 +--- a/man/systemd.automount.xml ++++ b/man/systemd.automount.xml +@@ -60,7 +60,7 @@ + <varname>After=network-online.target</varname> or similar on network + filesystems. Doing so may result in an ordering cycle.</para> + +- <para>Note that automount support on Linux is privileged, automount units are hence only available in the ++ <para>Note that automount support on GNU/Linux is privileged, automount units are hence only available in the + system service manager (and root's user service manager), but not in unprivileged users' service + managers.</para> + +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index a6716495db..f6d8c0a0b3 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -42,7 +42,7 @@ + information on the specific unit configuration files. The execution specific configuration options are configured + in the [Service], [Socket], [Mount], or [Swap] sections, depending on the unit type.</para> + +- <para>In addition, options which control resources through Linux Control Groups (cgroups) are listed in ++ <para>In addition, options which control resources through Linux kernel Control Groups (cgroups) are listed in + <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + Those options complement options listed here.</para> + </refsect1> +@@ -165,7 +165,7 @@ + to <varname>RootDirectory=</varname> however mounts a file system hierarchy from a block device node + or loopback file instead of a directory. The device node or file system image file needs to contain a + file system without a partition table, or a file system within an MBR/MS-DOS or GPT partition table +- with only a single Linux-compatible partition, or a set of file systems within a GPT partition table ++ with only a single Linux-kernel-compatible partition, or a set of file systems within a GPT partition table + that follows the + <ulink url="https://uapi-group.org/specifications/specs/discoverable_partitions_specification"> + Discoverable Partitions Specification</ulink>.</para> +@@ -403,7 +403,7 @@ + unit's processes. This controls the <literal>subset=</literal> mount option of the + <literal>procfs</literal> instance for the unit. For further details see <ulink + url="https://docs.kernel.org/filesystems/proc.html#mount-options">The /proc +- Filesystem</ulink>. Note that Linux exposes various kernel APIs via <filename>/proc/</filename>, ++ Filesystem</ulink>. Note that GNU/Linux exposes various kernel APIs via <filename>/proc/</filename>, + which are made unavailable with this setting. Since these APIs are used frequently this option is + useful only in a few, specific cases, and is not suitable for most non-trivial programs.</para> + +@@ -615,7 +615,7 @@ + <literal>-</literal>, except for the first character which must be one of a-z, A-Z and + <literal>_</literal> (i.e. digits and <literal>-</literal> are not permitted as first character). The + user/group name must have at least one character, and at most 31. These restrictions are made in +- order to avoid ambiguities and to ensure user/group names and unit files remain portable among Linux ++ order to avoid ambiguities and to ensure user/group names and unit files remain portable among GNU/Linux + systems. For further details on the names accepted and the names warned about see <ulink + url="https://systemd.io/USER_NAMES">User/Group Name Syntax</ulink>.</para> + +@@ -951,13 +951,13 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> + enforcement. For example, time limits specified for <varname>LimitCPU=</varname> will be rounded up + implicitly to multiples of 1s. For <varname>LimitNICE=</varname> the value may be specified in two + syntaxes: if prefixed with <literal>+</literal> or <literal>-</literal>, the value is understood as +- regular Linux nice value in the range -20…19. If not prefixed like this the value is understood as ++ regular Linux kernel nice value in the range -20…19. If not prefixed like this the value is understood as + raw resource limit parameter in the range 0…40 (with 0 being equivalent to 1).</para> + + <para>Note that most process resource limits configured with these options are per-process, and + processes may fork in order to acquire a new set of resources that are accounted independently of the + original process, and may thus escape limits set. Also note that <varname>LimitRSS=</varname> is not +- implemented on Linux, and setting it has no effect. Often it is advisable to prefer the resource ++ implemented on the Linux kernel, and setting it has no effect. Often it is advisable to prefer the resource + controls listed in + <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> + over these per-process limits, as they apply to services as a whole, may be altered dynamically at +@@ -1041,13 +1041,13 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> + <entry>LimitRSS=</entry> + <entry>ulimit -m</entry> + <entry>Bytes</entry> +- <entry>Don't use. No effect on Linux.</entry> ++ <entry>Don't use. No effect on the Linux kernel.</entry> + </row> + <row> + <entry>LimitNOFILE=</entry> + <entry>ulimit -n</entry> + <entry>Number of File Descriptors</entry> +- <entry>Don't use. Be careful when raising the soft limit above 1024, since <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry> cannot function with file descriptors above 1023 on Linux. Nowadays, the hard limit defaults to 524288, a very high value compared to historical defaults. Typically applications should increase their soft limit to the hard limit on their own, if they are OK with working with file descriptors above 1023, i.e. do not use <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry>. Note that file descriptors are nowadays accounted like any other form of memory, thus there should not be any need to lower the hard limit. Use <varname>MemoryMax=</varname> to control overall service memory use, including file descriptor memory.</entry> ++ <entry>Don't use. Be careful when raising the soft limit above 1024, since <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry> cannot function with file descriptors above 1023 on GNU/Linux. Nowadays, the hard limit defaults to 524288, a very high value compared to historical defaults. Typically applications should increase their soft limit to the hard limit on their own, if they are OK with working with file descriptors above 1023, i.e. do not use <citerefentry project='man-pages'><refentrytitle>select</refentrytitle><manvolnum>2</manvolnum></citerefentry>. Note that file descriptors are nowadays accounted like any other form of memory, thus there should not be any need to lower the hard limit. Use <varname>MemoryMax=</varname> to control overall service memory use, including file descriptor memory.</entry> + </row> + <row> + <entry>LimitAS=</entry> +@@ -1303,7 +1303,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> + <option>local</option>. A list of NUMA nodes that should be associated with the policy must be specified + in <varname>NUMAMask=</varname>. For more details on each policy please see, + <citerefentry><refentrytitle>set_mempolicy</refentrytitle><manvolnum>2</manvolnum></citerefentry>. For overall +- overview of NUMA support in Linux see, ++ overview of NUMA support in GNU/Linux see + <citerefentry project='man-pages'><refentrytitle>numa</refentrytitle><manvolnum>7</manvolnum></citerefentry>. + </para> + +@@ -1632,7 +1632,7 @@ StateDirectory=aaa/bbb ccc</programlisting> + order to provide writable subdirectories within read-only directories. Use + <varname>ReadWritePaths=</varname> in order to allow-list specific paths for write access if + <varname>ProtectSystem=strict</varname> is used. Note that <varname>ReadWritePaths=</varname> cannot +- be used to gain write access to a file system whose superblock is mounted read-only. On Linux, for ++ be used to gain write access to a file system whose superblock is mounted read-only. On GNU/Linux, for + each mount point write access is granted only if the mount point itself <emphasis>and</emphasis> the + file system superblock backing it are not marked read-only. <varname>ReadWritePaths=</varname> only + controls the former, not the latter, hence a read-only file system superblock remains +@@ -1825,7 +1825,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting> + <varlistentry> + <term><varname>NetworkNamespacePath=</varname></term> + +- <listitem><para>Takes an absolute file system path referring to a Linux network namespace ++ <listitem><para>Takes an absolute file system path referring to a Linux kernel network namespace + pseudo-file (i.e. a file like <filename>/proc/$PID/ns/net</filename> or a bind mount or symlink to + one). When set the invoked processes are added to the network namespace referenced by that path. The + path has to point to a valid namespace file at the moment the processes are forked off. If this +@@ -1859,7 +1859,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting> + + <para>Note that IPC namespacing does not have an effect on + <constant>AF_UNIX</constant> sockets, which are the most common +- form of IPC used on Linux. Instead, <constant>AF_UNIX</constant> ++ form of IPC used on GNU/Linux. Instead, <constant>AF_UNIX</constant> + sockets in the file system are subject to mount namespacing, and + those in the abstract namespace are subject to network namespacing. + IPC namespacing only has an effect on SysV IPC (which is mostly +@@ -1883,7 +1883,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting> + <varlistentry> + <term><varname>IPCNamespacePath=</varname></term> + +- <listitem><para>Takes an absolute file system path referring to a Linux IPC namespace ++ <listitem><para>Takes an absolute file system path referring to a Linux kernel IPC namespace + pseudo-file (i.e. a file like <filename>/proc/$PID/ns/ipc</filename> or a bind mount or symlink to + one). When set the invoked processes are added to the network namespace referenced by that path. The + path has to point to a valid namespace file at the moment the processes are forked off. If this +@@ -2058,7 +2058,7 @@ BindReadOnlyPaths=/var/lib/systemd</programlisting> + <varlistentry> + <term><varname>ProtectControlGroups=</varname></term> + +- <listitem><para>Takes a boolean argument. If true, the Linux Control Groups (<citerefentry ++ <listitem><para>Takes a boolean argument. If true, the Linux kernel Control Groups (<citerefentry + project='man-pages'><refentrytitle>cgroups</refentrytitle><manvolnum>7</manvolnum></citerefentry>) hierarchies + accessible through <filename>/sys/fs/cgroup/</filename> will be made read-only to all processes of the + unit. Except for container managers no services should require write access to the control groups hierarchies; +@@ -2205,8 +2205,8 @@ RestrictFileSystems=ext4</programlisting> + <varlistentry> + <term><varname>RestrictNamespaces=</varname></term> + +- <listitem><para>Restricts access to Linux namespace functionality for the processes of this unit. For details +- about Linux namespaces, see <citerefentry ++ <listitem><para>Restricts access to Linux kernel namespace functionality for the processes of this unit. For details ++ about Linux kernel namespaces, see <citerefentry + project='man-pages'><refentrytitle>namespaces</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Either + takes a boolean argument, or a space-separated list of namespace type identifiers. If false (the default), no + restrictions on namespace creation and switching are made. If true, access to any kind of namespacing is +@@ -3194,7 +3194,7 @@ StandardInputData=V2XigLJyZSBubyBzdHJhbmdlcnMgdG8gbG92ZQpZb3Uga25vdyB0aGUgcnVsZX + <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> + for details about journal namespaces.</para> + +- <para>Internally, journal namespaces are implemented through Linux mount namespacing and ++ <para>Internally, journal namespaces are implemented through Linux kernel mount namespacing and + over-mounting the directory that contains the relevant <constant>AF_UNIX</constant> sockets used for + logging in the unit's mount namespace. Since mount namespaces are used this setting disconnects + propagation of mounts from the unit's processes to the host, similarly to how +@@ -4446,7 +4446,7 @@ StandardInputData=V2XigLJyZSBubyBzdHJhbmdlcnMgdG8gbG92ZQpZb3Uga25vdyB0aGUgcnVsZX + </tgroup> + </table> + +- <para>Finally, the BSD operating systems define a set of exit codes, typically defined on Linux systems too:</para> ++ <para>Finally, the BSD operating systems define a set of exit codes, typically defined on GNU/Linux systems too:</para> + + <table> + <title>BSD exit codes</title> +diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml +index 9cad358f1e..f857d74f86 100644 +--- a/man/systemd.netdev.xml ++++ b/man/systemd.netdev.xml +@@ -515,7 +515,7 @@ + <term><varname>EgressQOSMaps=</varname></term> + <term><varname>IngressQOSMaps=</varname></term> + <listitem> +- <para>Defines a mapping of Linux internal packet priority (<constant>SO_PRIORITY</constant>) ++ <para>Defines a mapping of Linux kernel internal packet priority (<constant>SO_PRIORITY</constant>) + to VLAN header PCP field for outgoing and incoming frames, respectively. Takes a + whitespace-separated list of integer pairs, where each integer must be in the range + 1…4294967294, in the format <literal>from</literal>-<literal>to</literal>, e.g., +diff --git a/man/systemd.network.xml b/man/systemd.network.xml +index 6dd38ea875..510516aae4 100644 +--- a/man/systemd.network.xml ++++ b/man/systemd.network.xml +@@ -1288,7 +1288,7 @@ Table=1234</programlisting></para> + <para>Takes a boolean. Joining multicast group on ethernet level via + <command>ip maddr</command> command would not work if we have an Ethernet switch that does + IGMP snooping since the switch would not replicate multicast packets on ports that did not +- have IGMP reports for the multicast addresses. Linux vxlan interfaces created via ++ have IGMP reports for the multicast addresses. Linux kernel vxlan interfaces created via + <command>ip link add vxlan</command> or networkd's netdev kind vxlan have the group option + that enables them to do the required join. By extending <command>ip address</command> command + with option <literal>autojoin</literal> we can get similar functionality for openvswitch (OVS) +@@ -1304,7 +1304,7 @@ Table=1234</programlisting></para> + <listitem> + + <para>This setting provides a method for integrating static and dynamic network configuration into +- Linux <ulink url="https://docs.kernel.org/netlabel/index.html">NetLabel</ulink> subsystem rules, ++ Linux kernel <ulink url="https://docs.kernel.org/netlabel/index.html">NetLabel</ulink> subsystem rules, + used by <ulink url="https://en.wikipedia.org/wiki/Linux_Security_Modules">Linux Security Modules + (LSMs)</ulink> for network access control. The label, with suitable LSM rules, can be used to + control connectivity of (for example) a service with peers in the local network. At least with +@@ -1324,7 +1324,7 @@ Table=1234</programlisting></para> + deconfigured. Failures to manage the labels will be ignored.</para> + + <para>Warning: Once labeling is enabled for network traffic, a lot of LSM access control points in +- Linux networking stack go from dormant to active. Care should be taken to avoid getting into a ++ Linux kernel networking stack go from dormant to active. Care should be taken to avoid getting into a + situation where for example remote connectivity is broken, when the security policy hasn't been + updated to consider LSM per-packet access controls and no rules would allow any network + traffic. Also note that additional configuration with <citerefentry +@@ -2346,7 +2346,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting> + <varlistentry> + <term><varname>SocketPriority=</varname></term> + <listitem> +- <para>The Linux socket option <constant>SO_PRIORITY</constant> applied to the raw IP socket used for ++ <para>The Linux kernel socket option <constant>SO_PRIORITY</constant> applied to the raw IP socket used for + initial DHCPv4 messages. Unset by default. Usual values range from 0 to 6. + More details about <constant>SO_PRIORITY</constant> socket option in + <citerefentry project='man-pages'><refentrytitle>socket</refentrytitle><manvolnum>7</manvolnum></citerefentry>. +diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml +index 79806199e5..cce148bf30 100644 +--- a/man/systemd.nspawn.xml ++++ b/man/systemd.nspawn.xml +@@ -189,7 +189,7 @@ + <term><varname>Capability=</varname></term> + <term><varname>DropCapability=</varname></term> + +- <listitem><para>Takes a space-separated list of Linux process ++ <listitem><para>Takes a space-separated list of Linux kernel process + capabilities (see + <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> + for details). The <varname>Capability=</varname> setting +@@ -216,7 +216,7 @@ + + <varlistentry> + <term><varname>AmbientCapability=</varname></term> +- <listitem><para>Takes a space-separated list of Linux process ++ <listitem><para>Takes a space-separated list of Linux kernel process + capabilities (see + <citerefentry project='man-pages'><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> + for details). The <varname>AmbientCapability=</varname> setting +diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml +index 42f265c950..203e38cc2e 100644 +--- a/man/systemd.resource-control.xml ++++ b/man/systemd.resource-control.xml +@@ -34,7 +34,7 @@ + <title>Description</title> + + <para>Unit configuration files for services, slices, scopes, sockets, mount points, and swap devices share a subset +- of configuration options for resource control of spawned processes. Internally, this relies on the Linux Control ++ of configuration options for resource control of spawned processes. Internally, this relies on the Linux kernel Control + Groups (cgroups) kernel concept for organizing processes in a hierarchical tree of named groups for the purpose of + resource management.</para> + +diff --git a/man/systemd.service.xml b/man/systemd.service.xml +index a5f6179ec3..1f1a8e53a2 100644 +--- a/man/systemd.service.xml ++++ b/man/systemd.service.xml +@@ -1217,7 +1217,7 @@ + <listitem><para>Configure the out-of-memory (OOM) killing policy for the kernel and the userspace OOM + killer + <citerefentry><refentrytitle>systemd-oomd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. +- On Linux, when memory becomes scarce to the point that the kernel has trouble allocating memory for ++ On the Linux kernel, when memory becomes scarce to the point that the kernel has trouble allocating memory for + itself, it might decide to kill a running process in order to free up memory and reduce memory + pressure. Note that <filename>systemd-oomd.service</filename> is a more flexible solution that aims + to prevent out-of-memory situations for the userspace too, not just the kernel, by attempting to +@@ -1239,7 +1239,7 @@ + <constant>continue</constant>.</para> + + <para>Use the <varname>OOMScoreAdjust=</varname> setting to configure whether processes of the unit +- shall be considered preferred or less preferred candidates for process termination by the Linux OOM ++ shall be considered preferred or less preferred candidates for process termination by the Linux kernel OOM + killer logic. See + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for + details.</para> +diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml +index 5e611997fc..47b3565e4d 100644 +--- a/man/systemd.slice.xml ++++ b/man/systemd.slice.xml +@@ -28,7 +28,7 @@ + + <para>A unit configuration file whose name ends in <literal>.slice</literal> encodes information about a slice + unit. A slice unit is a concept for hierarchically managing resources of a group of processes. This management is +- performed by creating a node in the Linux Control Group (cgroup) tree. Units that manage processes (primarily scope ++ performed by creating a node in the Linux kernel Control Group (cgroup) tree. Units that manage processes (primarily scope + and service units) may be assigned to a specific slice. For each slice, certain resource limits may be set that + apply to all processes of all units contained in that slice. Slices are organized hierarchically in a tree. The + name of the slice encodes the location in the tree. The name consists of a dash-separated series of names, which +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index 647b7dbb72..11dc37d03f 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -292,7 +292,7 @@ + project='man-pages'><refentrytitle>mq_overview</refentrytitle><manvolnum>7</manvolnum></citerefentry> + for details). This expects a valid message queue name (i.e. beginning with + <literal>/</literal>). Behavior otherwise is very similar to the <varname>ListenFIFO=</varname> +- directive above. On Linux message queue descriptors are actually file descriptors and can be ++ directive above. On GNU/Linux message queue descriptors are actually file descriptors and can be + inherited between processes.</para></listitem> + </varlistentry> + +diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml +index 1c019b26d8..3c5c0b1029 100644 +--- a/man/systemd.swap.xml ++++ b/man/systemd.swap.xml +@@ -58,7 +58,7 @@ + units cannot be templated, nor is possible to add multiple names to a swap unit by creating additional symlinks to + it.</para> + +- <para>Note that swap support on Linux is privileged, swap units are hence only available in the system ++ <para>Note that swap support on GNU/Linux is privileged, swap units are hence only available in the system + service manager (and root's user service manager), but not in unprivileged user's service manager.</para> + </refsect1> + +diff --git a/man/systemd.xml b/man/systemd.xml +index 42da75022f..301193329c 100644 +--- a/man/systemd.xml ++++ b/man/systemd.xml +@@ -37,7 +37,7 @@ + <refsect1> + <title>Description</title> + +- <para>systemd is a system and service manager for Linux operating systems. When run as first process on ++ <para>systemd is a system and service manager for GNU/Linux operating systems. When run as first process on + boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate + instances are started for logged-in users to start their services.</para> + +@@ -212,7 +212,7 @@ + memory its accounting data is flushed out too. However, this data is generally not lost, as a journal log record + is generated declaring the consumed resources whenever a unit shuts down.</para> + +- <para>Processes systemd spawns are placed in individual Linux control groups named after the unit which ++ <para>Processes systemd spawns are placed in individual Linux kernel control groups named after the unit which + they belong to in the private systemd hierarchy. (see <ulink + url="https://docs.kernel.org/admin-guide/cgroup-v2.html">Control Groups v2</ulink> for more information + about control groups, or short "cgroups"). systemd uses this to effectively keep track of +@@ -785,7 +785,7 @@ + + <para>When run as the system instance, systemd parses a number of options listed below. They can be + specified as kernel command line arguments which are parsed from a number of sources depending on the +- environment in which systemd is executed. If run inside a Linux container, these options are parsed from ++ environment in which systemd is executed. If run inside a container, these options are parsed from + the command line arguments passed to systemd itself, next to any of the command line options listed in + the Options section above. If run outside of Linux containers, these arguments are parsed from + <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable +diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml +index 971b7e6a9e..b25d36332a 100644 +--- a/man/tmpfiles.d.xml ++++ b/man/tmpfiles.d.xml +@@ -416,7 +416,7 @@ L /tmp/foobar - - - - /dev/null</programlisting> + names. This can be useful for setting SMACK labels. Does not follow symlinks.</para> + + <para>Please note that extended attributes settable with this line type are a different concept +- from the Linux file attributes settable with <varname>h</varname>/<varname>H</varname>, see ++ from the Linux kernel file attributes settable with <varname>h</varname>/<varname>H</varname>, see + below.</para> + + <xi:include href="version-info.xml" xpointer="v218"/></listitem> +@@ -431,7 +431,7 @@ L /tmp/foobar - - - - /dev/null</programlisting> + + <varlistentry> + <term><varname>h</varname></term> +- <listitem><para>Set Linux file/directory attributes. Lines of this type accept shell-style globs in ++ <listitem><para>Set Linux kernel file/directory attributes. Lines of this type accept shell-style globs in + place of normal path names.</para> + + <para>The format of the argument field is <varname>[+-=][aAcCdDeijPsStTu]</varname>. The prefix +@@ -447,7 +447,7 @@ L /tmp/foobar - - - - /dev/null</programlisting> + corresponding to the letters listed here. All other attributes will be left untouched. Does not + follow symlinks.</para> + +- <para>Please note that the Linux file attributes settable with this line type are a different ++ <para>Please note that the Linux kernel file attributes settable with this line type are a different + concept from the extended attributes settable with <varname>t</varname>/<varname>T</varname>, + see above.</para></listitem> + </varlistentry> +diff --git a/man/ukify.xml b/man/ukify.xml +index 9b7e20997a..3f1ceb6d30 100644 +--- a/man/ukify.xml ++++ b/man/ukify.xml +@@ -458,7 +458,7 @@ + <term><option>--sign-kernel</option></term> + <term><option>--no-sign-kernel</option></term> + +- <listitem><para>Override the detection of whether to sign the Linux binary itself before it is ++ <listitem><para>Override the detection of whether to sign the Linux kernel binary itself before it is + embedded in the combined image. If not specified, it will be signed if a SecureBoot signing key is + provided via the + <varname>SecureBootPrivateKey=</varname>/<option>--secureboot-private-key=</option> option and the +@@ -582,7 +582,7 @@ + <constant>enter-initrd</constant> phase) with the key + <filename index='false'>pcr-private-initrd-key.pem</filename>, and for the main system (phases + <constant>leave-initrd</constant>, <constant>sysinit</constant>, <constant>ready</constant>) with the +- key <filename index='false'>pcr-private-system-key.pem</filename>. The Linux binary and the resulting ++ key <filename index='false'>pcr-private-system-key.pem</filename>. The Linux kernel binary and the resulting + combined image will be signed with the SecureBoot key <filename index='false'>sb.key</filename>.</para> + </example> + +-- +2.44.0 + diff --git a/libre/systemd/30-systemd-daemon-reload.hook b/libre/systemd/30-systemd-daemon-reload-system.hook index dff95e497..a305d734d 100644 --- a/libre/systemd/30-systemd-daemon-reload.hook +++ b/libre/systemd/30-systemd-daemon-reload-system.hook @@ -8,4 +8,4 @@ Target = usr/lib/systemd/system/* [Action] Description = Reloading system manager configuration... When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-system diff --git a/libre/systemd/30-systemd-daemon-reload-user.hook b/libre/systemd/30-systemd-daemon-reload-user.hook new file mode 100644 index 000000000..3eddf8f30 --- /dev/null +++ b/libre/systemd/30-systemd-daemon-reload-user.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/user/* + +[Action] +Description = Reloading user manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload-user diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 67b3f93df..8e1d030f4 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -2,6 +2,7 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Contributor: bill-auger <bill-auger@programmer.net> # Tips for the maintainer (i.e.: future me?): # @@ -20,6 +21,7 @@ # - `systemd-libs`: `libsystemd.so`, `libudev.so`, and the NSS modules # - `systemd-resolvconf`: resolvconf(1) # - `systemd-sysvcompat`: init(1), halt(8), poweroff(8), reboot(8), shutdown(8) +# - `systemd-ukify`: ukify(1) # * historical systemd pkgname=() values: # - `udev`: existed as a split package 2012-02 to 2012-05, when it merged into # `systemd-tools` @@ -74,30 +76,43 @@ # - `nss-resolve`: `libnss_resolve.so` pkgbase=systemd -pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') +pkgname=('systemd' + 'systemd-libs' + 'systemd-resolvconf' + 'systemd-sysvcompat' + 'systemd-ukify') 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-}") -_tag='eb0f8fc41511dda1f9e0d19e830cc8c6668a2628' # git rev-parse v${_tag_name} -_tag_name=253 -pkgver="${_tag_name/-/}" -pkgrel=1 -pkgrel+=.parabola3 +_tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name} +_tag_name=255.4 +# Upstream versioning is incompatible with pacman's version comparisons so we +# replace tildes with the empty string to make sure pacman's version comparing +# does the right thing for rc versions: +# ➜ vercmp 255~rc1 255 +# 1 +# ➜ vercmp 255rc1 255 +# -1 +pkgver="${_tag_name/~/}" +pkgrel=2 +pkgrel+=.parabola1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') +license=('LGPL-2.1-or-later') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt' 'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers' - 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' + 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git' 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync' - 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls') -makedepends=(${makedepends[*]/gnu-efi-libs}) # don't include on non-x86 (FIXME(lukeshu): why not on ARM, EFI is a thing there) -makedepends_i686=('gnu-efi-libs' 'pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686? -makedepends_x86_64=('gnu-efi-libs') -options=('strip') + 'bpf' 'libbpf' 'clang' 'llvm' 'curl' 'gnutls' 'python-pyelftools' + 'libpwquality' 'qrencode' 'lib32-gcc-libs' 'python-pefile') +makedepends=(${makedepends[*]/lib32-gcc-libs}) # only include lib32-gcc-libs on x86_64 +makedepends_x86_64=('lib32-gcc-libs') +makedepends_i686=('pkgconf') # FIXME(lukeshu): Why do we need to request `pkgconf` on i686? +conflicts=("mkinitcpio<38-1") validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com> @@ -105,17 +120,13 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering < source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed" '0001-Use-Arch-Linux-device-access-groups.patch' - '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' + '0001-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.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' '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' - '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' - '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch' - # mkinitcpio files - 'initcpio-hook-udev' - 'initcpio-install-systemd' - 'initcpio-install-udev' + '0006-FSDG-man-Mention-Parabola-instead-of-Arch.patch' + '0007-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' # bootloader files 'parabola.conf' 'loader.conf' @@ -127,7 +138,8 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" '20-systemd-sysusers.hook' '30-systemd-binfmt.hook' '30-systemd-catalog.hook' - '30-systemd-daemon-reload.hook' + '30-systemd-daemon-reload-system.hook' + '30-systemd-daemon-reload-user.hook' '30-systemd-hwdb.hook' '30-systemd-sysctl.hook' '30-systemd-tmpfiles.hook' @@ -136,25 +148,23 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" sha512sums=('SKIP' 'SKIP' '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e' - '52e607f5b11e66ad71333c1b03119575b1018c74df4e98376c28e59a21a348e3010d95863d818fdd5175acccbd627047a70a579671909288e10d28b247e494ca' - '0e87e6770343e9c1a1b57548c8d9d985df1d3be60e6199825e61ce5c1321cb1924db81feea099bba8cb94fdce9d1ca7f41b0c030d681a9453d5d5bad05cffc25' - '0f571decd80622feffa6fe694ba33628a1c2f62db3a83bf03b5e3fc720b25f91567c5a0412aaebc554cd5ad889b63ded404cb7b2eb217677b070e0527bf302a2' - '9ba07104a1b26f736274813624b08e59f3e5a9035e6277f566a1d012372d1d60fe9ffbeff1b24e0319133d175e5e65caa99a71eaa213372486fa1edb1145c4a3' - 'e8576f581dc6706bdd495128972d2ac90acf76a15117d67b792fb9ad5a2dd5597c96338965632857085ddd8362c9cb022d180f4aa29a026f953236d01756dbca' - '6c7c10cbded0e75677064a6c5fb4e79c21b0fea167104a95b65a856cd255f8d73e2b706ddbee86b357c35440f32e1f390217a85e41a10302955023df825e1017' - '73fd324d90c8f86596544ce16d2571b510e4d97a2fdf1e11fd73c9408bafb3938ece4b6e4b4fccfca40856172b010b9a7ad116da7c8738cf9673b676e8525edd' - 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b' - 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' + 'b01d28646bca80c33192a10728218427b95246f904d921d00451bd32673f6352aefe6a8168942e796f4b7d1682921cc5c6adb895c9d9cdc0365606bfd4eca391' + 'fb1f75ded29d635c9e746ce76a99ace4e79694eea6d6ec7e8a84d7700e92ee5698576b979e16d71316c3e9276f285e3db248f74e8e55a8cf719456f6abc362b1' + '03df948013f353e3fb6db745a01520c2dc8278b823e57178aca1c59786b81dd8a2e10e7f603e33028e1e9084a753cb7a09ebd4b4291dbdda30a16eba39628866' + '2e89361d6af47464b91a04dc4be7a941ff12894b56831702deb6063d8d386141ff04989d1ecb39dbc452d83caacd5830c8eb6b06350c4bee6ccd3383aa2b1c8f' + '0b634f674468e6c859e7faff9bbf9d310a2c1feac2ceb4bfd5cb132e9b706f512908c1c905c72181395a5f0d0af40600e62ef46ce1ab534beb0b8d16aba0a2be' + '819331360737c59bc6fa2ca681da16bdae599d83289d619da802c4ffff2fe3b72852b11d50caecc058c80022b6b5158c5309560670fa2c30c08e9bb14b7e0454' + 'eb4ca9b4460f19ac93885d8e22ae4e844d0798918d692d84333e4f1b5ae6fa28a2443d156e31202c1c05f97c3f61531a8822f1b0e66ccc00e20743b871322aa8' '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c' 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - 'a586f62b92268ae1e8a9310b02693548fb114292e1252953b4c9475d29e2817b5042a612f3b3ef09fb5b18126e2c3486ff49dd764d97644f0c510ae0200e075b' + '3cb8f88c1bffc753d0c540be5d25a0fdb9224478cca64743b5663340f2f26b197775286e6e680228db54c614dcd11da1135e625674a622127681662bec4fa886' '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5' '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7' '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc' - '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254' + 'a436d3f5126c6c0d6b58c6865e7bd38dbfbfb7babe017eeecb5e9d162c21902cbf4e0a68cf3ac2f99815106f9fa003b075bd2b4eb5d16333fa913df6e2f3e32a' + '190112e38d5a5c0ca91b89cd58f95595262a551530a16546e1d84700fc9644aa2ca677953ffff655261e8a7bff6e6af4e431424df5f13c00bc90b77c421bc32d' 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154' '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de' 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc' @@ -173,18 +183,16 @@ prepare() { # add upstream repository for cherry-picking git remote add -f upstream ../systemd - local _c + local _c _l for _c in "${_backports[@]}"; do - if [[ $_c == *..* ]]; then - git log --oneline --reverse "${_c}" - else - git log --oneline -1 "${_c}" - fi - git cherry-pick -n -m1 "${_c}" + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git cherry-pick --mainline 1 --no-commit "${_c}" done for _c in "${_reverts[@]}"; do - git log --oneline -1 "${_c}" - git revert -n "${_c}" + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git revert --mainline 1 --no-commit "${_c}" done # Replace cdrom/dialout/tape groups with optical/uucp/storage @@ -193,6 +201,7 @@ prepare() { # apply FSDG patches local _patch for _patch in "$srcdir"/????-FSDG-*.patch; do + echo "applying $_patch" patch -Np1 -i "$_patch" done } @@ -219,21 +228,26 @@ build() { fi local _meson_options=( - # internal version comparison is incompatible with pacman: - # 249~rc1 < 249 < 249.1 < 249rc - -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola" + -Dversion-tag="${_tag_name}-${pkgrel}-parabola" + # We use the version without tildes as the shared library tag because + # pacman looks at the shared library version. -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release + -Dapparmor=false + -Dbootloader=true + -Dxenctrl=false -Dbpf-framework=true -Dima=false -Dlibidn2=true -Dlz4=true -Dman=true + -Dnscd=false + -Dselinux=false # 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=unified @@ -255,69 +269,91 @@ build() { -Dsbat-distro-version="${pkgver}" -Dsbat-distro-url="https://www.parabola.nu/packages/libre/${CARCH}/${pkgname}/" ) - if [ "$CARCH" != "armv7h" ]; then - # FIXME(lukeshu): Why do we turn off -Dgnu-efi on ARM? EFI is a - # thing on ARM. - _meson_options+=(-Dgnu-efi=true) - fi arch-meson "$pkgbase-stable" build "${_meson_options[@]}" meson compile -C build # Go ahead and split the package now. It's easier this way, because - # we can use mv instead of awkward, error-prone rm/cp pairs. - rm -rf "$srcdir/dest" + # we can use `mv` instead of awkward+error-prone pairs of `rm`ing + # the files in package_systemd() and then re-creating them in the + # other package_ functions. # Put things in the main `systemd` package by default. meson install -C build --destdir "$srcdir/dest/systemd" - # Pull out `systemd-common`. - install -dm755 "$srcdir/dest/common"/usr/lib/systemd - mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/"libsystemd-shared-${pkgver}-${pkgrel}.so" - - # Pull out `systemd-libsystemd`. - install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include} - mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd - mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc - mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/ - mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/ - - # Pull out `systemd-libudev`. - install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include} - mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h - mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc - mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/ - mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/ - - # Pull out `systemd-udev`. - install -dm755 "$srcdir/dest/udev"/{etc,usr/lib} - mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/ - mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/ + # Parabola: Pull out `systemd-common`. + install -dm755 "$srcdir/dest/systemd-common"/usr/lib/systemd + mv -T "$srcdir/dest"/systemd{,-common}/usr/lib/systemd/"libsystemd-shared-${pkgver}-${pkgrel}.so" + + # Pull out `systemd-libs`. + install -d -m0755 "$srcdir/dest/systemd-libs"/usr/{lib,share/man/man8} + mv "$srcdir/dest/systemd"/usr/lib/lib{nss,systemd,udev}*.so* -t "$srcdir/dest/systemd-libs"/usr/lib/ + mv "$srcdir/dest/systemd"/usr/lib/pkgconfig -t "$srcdir/dest/systemd-libs"/usr/lib/ + mv "$srcdir/dest/systemd"/usr/include -t "$srcdir/dest/systemd-libs"/usr/ + mv "$srcdir/dest/systemd"/usr/share/man/man3 -t "$srcdir/dest/systemd-libs"/usr/share/man/ + mv "$srcdir/dest/systemd"/usr/share/man/man8/{nss-,libnss_}* -t "$srcdir/dest/systemd-libs"/usr/share/man/man8/ + + # Parabola: Further split `systemd-libs` + { + # Pull out `systemd-libsystemd`. + install -dm755 "$srcdir/dest/systemd-libsystemd"/usr/{lib/pkgconfig,share/man/man3,include} + mv -T "$srcdir/dest"/systemd-{libs,libsystemd}/usr/include/systemd + mv -T "$srcdir/dest"/systemd-{libs,libsystemd}/usr/lib/pkgconfig/libsystemd.pc + mv "$srcdir/dest/systemd-libs"/usr/lib/libsystemd.so* -t "$srcdir/dest/systemd-libsystemd"/usr/lib/ + mv "$srcdir/dest/systemd-libs"/usr/share/man/man3/{SD,sd,libsystemd}* -t "$srcdir/dest/systemd-libsystemd"/usr/share/man/man3/ + + # Pull out `systemd-libudev`. + install -dm755 "$srcdir/dest/systemd-libudev"/usr/{lib/pkgconfig,share/man/man3,include} + mv -T "$srcdir/dest"/systemd-{libs,libudev}/usr/include/libudev.h + mv -T "$srcdir/dest"/systemd-{libs,libudev}/usr/lib/pkgconfig/libudev.pc + mv "$srcdir/dest/systemd-libs"/usr/lib/libudev.so* -t "$srcdir/dest/systemd-libudev"/usr/lib/ + mv "$srcdir/dest/systemd-libs"/usr/share/man/man3/*udev* -t "$srcdir/dest/systemd-libudev"/usr/share/man/man3/ + + # Pull out `systemd-nss-*`. + local nssmodule + for nssmodule in systemd myhostname mymachines resolve; do + install -dm755 "$srcdir/dest/systemd-nss-$nssmodule"/usr/{lib,share/man/man8} + mv -t "$srcdir/dest/systemd-nss-$nssmodule"/usr/share/man/man8/ -- \ + "$srcdir/dest/systemd-libs"/usr/share/man/man8/nss-$nssmodule.8 \ + "$srcdir/dest/systemd-libs"/usr/share/man/man8/libnss_$nssmodule.*.8 + mv -t "$srcdir/dest/systemd-nss-$nssmodule"/usr/lib/ -- \ + "$srcdir/dest/systemd-libs"/usr/lib/libnss_$nssmodule.so* + done + + # Verify that there's nothing left in `systemd-libs`. + diff -u /dev/null <(find "$srcdir/dest/systemd-libs" -not -type d) + } + + # Parabola: Pull out `systemd-udev`. + # NB: Must do this *after* pulling out `systemd-libudev`. + install -dm755 "$srcdir/dest/systemd-udev"/{etc,usr/lib} + mv -T "$srcdir/dest"/systemd{,-udev}/etc/udev/ + mv -T "$srcdir/dest"/systemd{,-udev}/usr/lib/udev/ while read -d '' -r file; do - install -dm755 "$srcdir/dest/udev/${file%/*}" - mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file" + install -dm755 "$srcdir/dest/systemd-udev/${file%/*}" + mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/systemd-udev/$file" done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0') - # Pull out `systemd-nss-*`. - local nssmodule - for nssmodule in systemd myhostname mymachines resolve; do - install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} - mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \ - "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \ - "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8 - mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/ - done + # Pull out `systemd-ukify`. + install -d -m0755 "$srcdir/dest/systemd-ukify"/usr/{bin,lib/{systemd,kernel/install.d},share/man/man1} + mv "$srcdir/dest/systemd"/usr/bin/ukify -t "$srcdir/dest/systemd-ukify"/usr/bin/ + mv "$srcdir/dest/systemd"/usr/lib/systemd/ukify -t "$srcdir/dest/systemd-ukify"/usr/lib/systemd/ + mv "$srcdir/dest/systemd"/usr/share/man/man1/ukify.1 -t "$srcdir/dest/systemd-ukify"/usr/share/man/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 "$srcdir/dest/systemd"/usr/lib/kernel/install.d/60-ukify.install -t "$srcdir/dest/systemd-ukify"/usr/lib/kernel/install.d # Pull out `systemd-sysvcompat`. - install -dm755 "$srcdir/dest/sysvcompat"/usr/share/man/man{1,8} - mv "$srcdir/dest/systemd"/usr/share/man/man1/init.1 \ - -t "$srcdir/dest/sysvcompat"/usr/share/man/man1 - mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 \ - -t "$srcdir/dest/sysvcompat"/usr/share/man/man8 - - # Tidy up the main `systemd` package. - rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include} + install -d -m0755 "$srcdir/dest/systemd-sysvcompat"/usr/{bin,share/man/man{1,8}} + mv "$srcdir/dest/systemd"/usr/share/man/man1/init.1 -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man1/ + mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8/ + mv "$srcdir/dest/systemd"/usr/bin/{halt,init,poweroff,reboot,shutdown} -t "$srcdir/dest/systemd-sysvcompat"/usr/bin/ + + # Pull out `systemd-resolvconf`. + install -d -m0755 "$srcdir/dest/systemd-resolvconf"/usr/{bin,share/man/man1} + mv "$srcdir/dest/systemd"/usr/share/man/man1/resolvconf.1 -t "$srcdir/dest/systemd-resolvconf"/usr/share/man/man1/ + mv "$srcdir/dest/systemd"/usr/bin/resolvconf -t "$srcdir/dest/systemd-resolvconf"/usr/bin/ } check() { @@ -335,7 +371,7 @@ check() { # 537/1081 systemd:test / test-sigbus TIMEOUT 30.36s killed by signal 15 SIGTERM # 559/1081 systemd:test / test-fileio FAIL 1.93s killed by signal 6 SIGABRT [[ "${CARCH}" == armv7h ]] || - meson test -C build + meson test -C build --print-errorlogs } # How we use this function might seem like "overthinking it", and it @@ -345,13 +381,13 @@ _lib_deps() { # Resolve short names, to make calling code readable. # Where, relative to $srcdir, each .so file lives. declare -A paths=( - [libsystemd-shared]="dest/common/usr/lib/systemd/libsystemd-shared-${pkgver}-${pkgrel}.so" - [libsystemd]='dest/libsystemd/usr/lib/libsystemd.so' - [libudev]='dest/libudev/usr/lib/libudev.so' - [libnss_systemd]='dest/nss-systemd/usr/lib/libnss_systemd.so.2' - [libnss_myhostname]='dest/nss-myhostname/usr/lib/libnss_myhostname.so.2' - [libnss_mymachines]='dest/nss-mymachines/usr/lib/libnss_mymachines.so.2' - [libnss_resolve]='dest/nss-resolve/usr/lib/libnss_resolve.so.2' + [libsystemd-shared]="dest/systemd-common/usr/lib/systemd/libsystemd-shared-${pkgver}-${pkgrel}.so" + [libsystemd]='dest/systemd-libsystemd/usr/lib/libsystemd.so' + [libudev]='dest/systemd-libudev/usr/lib/libudev.so' + [libnss_systemd]='dest/systemd-nss-systemd/usr/lib/libnss_systemd.so.2' + [libnss_myhostname]='dest/systemd-nss-myhostname/usr/lib/libnss_myhostname.so.2' + [libnss_mymachines]='dest/systemd-nss-mymachines/usr/lib/libnss_mymachines.so.2' + [libnss_resolve]='dest/systemd-nss-resolve/usr/lib/libnss_resolve.so.2' ) local libname libfile txtfile mode @@ -411,24 +447,31 @@ _lib_deps() { package_systemd() { pkgdesc='system and service manager' - license=('GPL2' 'LGPL2.1') + license+=( + 'CC0-1.0' # siphash # Parabola: ends up in systemd-common + 'GPL-2.0-or-later' # udev # Parabola: ends up in systemd-udev + 'MIT-0' # documentation and config files + ) depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus' - 'dbus-units' 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so' + 'dbus-units' 'kbd' 'kmod' 'libkmod.so' 'hwdata' 'libcap' 'libcap.so' 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'lz4' 'pam' 'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so' - 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' + 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'openssl' 'libcrypto.so' 'libssl.so') provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev') conflicts=('nss-myhostname' 'systemd-tools' 'udev') - optdepends=('libmicrohttpd: remote journald capabilities' + optdepends=('libmicrohttpd: systemd-journal-gatewayd and systemd-journal-remote' 'quota-tools: kernel-level quota management' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'systemd-ukify: combine kernel and initrd into a signed Unified Kernel Image' 'polkit: allow administration as unprivileged user' - 'python: Unified Kernel Image with ukify' 'curl: systemd-journal-upload, machinectl pull-tar and pull-raw' 'gnutls: systemd-journal-gatewayd and systemd-journal-remote' + 'qrencode: show QR codes' + 'iptables: firewall features' 'libbpf: support BPF programs' + 'libpwquality: check password quality' 'libfido2: unlocking LUKS2 volumes with FIDO2 token' 'libp11-kit: support PKCS#11' 'tpm2-tss: unlocking LUKS2 volumes with TPM2') @@ -447,12 +490,13 @@ package_systemd() { etc/systemd/system.conf etc/systemd/timesyncd.conf etc/systemd/user.conf + etc/udev/iocost.conf etc/udev/udev.conf) install=systemd.install # Parabola: Split the package. - license=('LGPL2.1') # The GPL2 parts end up in `systemd-udev` # (the "eval"/"outputvar" parts are so that `makepkg --printsrcinfo` works) + license=($(eval "printf '%s\n' \"\${${outputvar:-license}[@]}\"|grep -vFx -e CC0-1.0 -e GPL-2.0-or-later")) # the CC0 parts end up in systemd-common, the GPL2 parts end up in systemd-udev depends=($(eval "printf '%s\n' \"\${${outputvar:-depends}[@]}\"|grep -vFx -f <(_lib_deps libsystemd-shared)")) depends+=("systemd-common=$pkgver-$pkgrel" 'udev') provides=($(eval "printf '%s\n' \"\${${outputvar:-provides}[@]}\"|grep -v -e nss-myhostname -e ^udev=")) @@ -465,21 +509,6 @@ package_systemd() { # we'll create this on installation rmdir "$pkgdir"/var/log/journal/remote - # Parabola: Commented out because we do ~this in build(): - # - ## # runtime libraries shipped with systemd-libs - ## install -d -m0755 systemd-libs - ## mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs - ## - ## # manpages shipped with systemd-sysvcompat - ## rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 - - # executable (symlinks) shipped with systemd-sysvcompat - 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/{issue,nsswitch.conf} sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ @@ -488,19 +517,11 @@ package_systemd() { # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - # add mkinitcpio hooks - install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd - #install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev # Parabola: moved to package_systemd-udev() - #install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev # Parabola: moved to package_systemd-udev() - # 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 - # add example bootctl configuration install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf @@ -518,7 +539,11 @@ package_systemd() { package_systemd-libs() { pkgdesc='systemd client libraries' depends=('glibc' 'gcc-libs' 'libcap' 'libgcrypt' 'lz4' 'xz' 'zstd') - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + 'MIT-0' # documentation + ) provides=('libsystemd' 'libsystemd.so' 'libudev.so') conflicts=('libsystemd') replaces=('libsystemd') @@ -533,41 +558,41 @@ package_systemd-libs() { depends=("${_systemd_libs[@]}") # (the "eval"/"outputvar" parts are so that `makepkg --printsrcinfo` works) provides=($(eval "printf '%s\n' \"\${${outputvar:-provides}[@]}\"|grep -v -e '\.so$'")) + return + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-resolvconf() { pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' - license=('LGPL2.1') depends=('systemd') provides=('openresolv' 'resolvconf') - conflicts=('openresolv') + conflicts=('resolvconf') replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed - install -d -m0755 "$pkgdir"/usr/bin - ln -s resolvectl "$pkgdir"/usr/bin/resolvconf - - install -d -m0755 "$pkgdir"/usr/share/man/man1 - ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-sysvcompat() { pkgdesc='sysvinit compat for systemd' - license=('GPL2') conflicts=('sysvinit') depends=('systemd') - license=('LGPL2.1') # Arch's license is wrong. provides=('init') conflicts+=('init') - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" +} - install -d -m0755 "$pkgdir"/usr/bin - ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init - for tool in halt poweroff reboot shutdown; do - ln -s systemctl "$pkgdir"/usr/bin/$tool - done +package_systemd-ukify() { + pkgdesc='Combine kernel and initrd into a signed Unified Kernel Image' + provides=('ukify') + depends=('binutils' 'python-cryptography' 'python-pefile' 'systemd') + optdepends=('python-pillow: Show the size of splash image' + 'sbsigntools: Sign the embedded kernel') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } # vim:ft=sh syn=sh et sw=2: @@ -576,104 +601,126 @@ package_systemd-sysvcompat() { package_systemd-common() { pkgdesc='systemd files shared between split packages' - license=('LGPL2.1') depends=($(_lib_deps libsystemd-shared)) + license+=( + 'CC0-1.0' # siphash + ) - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook } package_systemd-udev() { pkgdesc='Userspace device file manager' - license=('GPL2') # NB: different than the rest + license+=('GPL-2.0-or-later') depends=("systemd-common=$pkgver-$pkgrel" 'systemd-libudev' 'hwdata' 'kmod' 'libkmod.so' 'util-linux' 'zlib') - backup=(etc/udev/udev.conf) + backup=(etc/udev/iocost.conf + etc/udev/udev.conf) provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" - - # add mkinitcpio hooks - install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev - install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" # pacman hooks install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook } +# TODO(lukeshu): I might have been over-zealous adding the licenses +# for `siphash` and `src/basic/linux/*` to the following packages; +# audit whether those packages actually inclode that code. + package_systemd-libsystemd() { pkgdesc='systemd client library' depends=($(_lib_deps libsystemd)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + 'MIT-0' # documentation + ) provides=('libsystemd.so') provides+=("libsystemd-standalone=$pkgver") conflicts+=('libsystemd-standalone') replaces+=('libsystemd-standalone') - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-libudev() { pkgdesc='systemd library for enumerating and introspecting local devices' depends=($(_lib_deps libudev)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides=('libudev.so') provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-nss-systemd() { pkgdesc='NSS module providing user and group resolution for dynamic users and groups' depends=($(_lib_deps libnss_systemd)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-nss-myhostname() { pkgdesc='NSS module providing hostname resolution for the locally configured system hostname' depends=($(_lib_deps libnss_myhostname)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-nss-mymachines() { pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances' depends=($(_lib_deps libnss_mymachines)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } package_systemd-nss-resolve() { pkgdesc='NSS module providing hostname resolution via systemd-resolved' depends=($(_lib_deps libnss_resolve)) - license=('LGPL2.1') + license+=( + 'CC0-1.0' # siphash + 'GPL-2.0-or-later WITH Linux-syscall-note' # src/basic/linux/* + ) provides+=("${pkgname#systemd-}=$pkgver") conflicts+=("${pkgname#systemd-}") replaces+=("${pkgname#systemd-}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } diff --git a/libre/systemd/initcpio-hook-udev b/libre/systemd/initcpio-hook-udev deleted file mode 100644 index ea9a11f8c..000000000 --- a/libre/systemd/initcpio-hook-udev +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create --boot - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd deleted file mode 100644 index c9aa0822b..000000000 --- a/libre/systemd/initcpio-install-systemd +++ /dev/null @@ -1,152 +0,0 @@ -#!/bin/bash - -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*) - # 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 - - done <"$unit" - - # preserve reverse soft dependency - for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do - if [[ -L $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 -} - -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 - - add_binary /usr/bin/kmod /usr/bin/modprobe - 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 \ - /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 \ - /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - - # udev rules and systemd units - map add_udev_rule "$rules" \ - 50-udev-default.rules \ - 60-persistent-storage.rules \ - 64-btrfs.rules \ - 80-drivers.rules \ - 99-systemd.rules - - map add_systemd_unit \ - initrd-cleanup.service \ - 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 \ - initrd.target \ - kmod-static-nodes.service \ - local-fs.target \ - local-fs-pre.target \ - paths.target \ - reboot.target \ - slices.target \ - sockets.target \ - swap.target \ - systemd-fsck@.service \ - systemd-hibernate-resume@.service \ - systemd-journald-audit.socket \ - systemd-journald-dev-log.socket \ - systemd-journald.service \ - systemd-modules-load.service \ - systemd-pcrphase-initrd.service \ - systemd-tmpfiles-setup-dev.service \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - systemd-udevd.service \ - systemd-udev-trigger.service \ - 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" - - printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ - 'passwd: files' \ - 'group: files' \ - 'shadow: files' - - 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 sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group" - - add_dir "/etc/modules-load.d" - ( - . "$_f_config" - set -f - printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" - ) -} - -help() { - cat <<HELPEOF -This will install a basic systemd setup in your initramfs, and is meant to -replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime -components will need to be ported, and will 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 -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/libre/systemd/initcpio-install-udev b/libre/systemd/initcpio-install-udev deleted file mode 100644 index fef6f9bb7..000000000 --- a/libre/systemd/initcpio-install-udev +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -build() { - local rules tool - - map add_binary \ - '/usr/lib/systemd/systemd-udevd' \ - '/usr/bin/udevadm' \ - '/usr/bin/systemd-tmpfiles' - - map add_udev_rule \ - '50-udev-default.rules' \ - '60-persistent-storage.rules' \ - '64-btrfs.rules' \ - '80-drivers.rules' - - map add_file \ - '/usr/lib/udev/ata_id' \ - '/usr/lib/udev/scsi_id' - - add_runscript -} - -help() { - cat <<HELPEOF -This hook adds the udev daemon to the initramfs, allowing for dynamic loading -of modules and reliable detection of the root device via tags (e.g. UUID or -LABEL). Do not remove this hook unless you are using the systemd hook, or you -know what you're doing. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/libre/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc b/libre/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc index c889904ea..2c907f78c 100644 --- a/libre/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc +++ b/libre/systemd/keys/pgp/63CDA1E5D3FC22B998D20DD6327F26951A015CC4.asc @@ -8,13 +8,13 @@ hvupalZDEL8CJVh+jKA9HcF584mQzV9BURxaWsU89sT7Jg7incdsOOSOJkCyaasO slt7vGKlUjHBqYCUCp336BVDOY5k2c6U52bsMvfywVAAFf4cDn3S9QHDyaYkur2R aqMrA/4giC+bF/K1sn4MHacr97QxEeeGNM6KG4z4QDmLeNdAANmJOLQaQFH+84Qj r8KyRV0zd0sioh3419AsZ/o41W4cIahovJKWyDcNwKI0tP2y3KZDVtmD26RQ/BO4 -aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QqTGVubmFydCBQ -b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcuZGU+iF4EExECABYECwoEAwMV -AwIDFgIBAheABQJGZKVoABIHZUdQRwABAQkQMn8mlRoBXMSoAACcCNTEt7jdZvVV -eAYZQu5caidHZvUAnArwD7mJLWddEUK2XXWOeyOY+0WmtCtMZW5uYXJ0IFBvZXR0 -ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5uZXQ+iGMEExECACMCGwMGCwkIBwMC -BBUCCAMEFgIDAQIeAQIXgAUCRmSlaQIZAQAKCRAyfyaVGgFcxNX0AKDeFj3gF+Fl -CMgnw1JWu/fM5H8pYgCg7VRzOxtpEEiDSw37hv4eifyo7P60L0xlbm5hcnQgUG9l +aFEqv3Uii0Cop6j495XmSvteL7CZHLEog90hexe9ExI0xIIBs7QrTGVubmFydCBQ +b2V0dGVyaW5nIDxsZW5uYXJ0QHBvZXR0ZXJpbmcubmV0PohjBBMRAgAjAhsDBgsJ +CAcDAgQVAggDBBYCAwECHgECF4AFAkZkpWkCGQEACgkQMn8mlRoBXMTV9ACg3hY9 +4BfhZQjIJ8NSVrv3zOR/KWIAoO1UczsbaRBIg0sN+4b+Hon8qOz+tCpMZW5uYXJ0 +IFBvZXR0ZXJpbmcgPGxlbm5hcnRAcG9ldHRlcmluZy5kZT6IXgQTEQIAFgQLCgQD +AxUDAgMWAgECF4AFAkZkpWgAEgdlR1BHAAEBCRAyfyaVGgFcxKgAAJwI1MS3uN1m +9VV4BhlC7lxqJ0dm9QCcCvAPuYktZ10RQrZddY57I5j7Raa0L0xlbm5hcnQgUG9l dHRlcmluZyAoTGlzYSkgPGxwb2V0dGVyaW5nQGxpc2EuZGU+iEkEMBECAAkFAk6K PXcCHSAACgkQMn8mlRoBXMSZNgCgjKt+QUMXVT1a2h25RkUyiiBPeAYAnRpV0f+q i9N55hov5qCieRGUdvVctDJMZW5uYXJ0IFBvZXR0ZXJpbmcgKFJlZCBIYXQpIDxs @@ -68,5 +68,5 @@ gjtxiXZHH/DPqxjqsO+jJQxOjf9Io6o93jR9O5knsmtaVp8JNE3RzO40Lyszwyeu lxylMpd1HfOt6MZYk0we0Ed7vVEPEjE08YF6sC0Qk1b7crk/t0GLOdYtABEBAAGI SQQYEQIACQUCToo80gIbDAAKCRAyfyaVGgFcxNUwAKCvb0Lisf/Rll5vPLqGGIci sDadOQCg30tdWRaNvasUMaTQL+fqE/pFzeI= -=mDgC +=uJel -----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc b/libre/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc index f11b1c1d3..d740744a8 100644 --- a/libre/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc +++ b/libre/systemd/keys/pgp/A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E.asc @@ -11,32 +11,32 @@ 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 @@ -166,41 +166,76 @@ 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 -7Szf8D81gDVfUGaNHpI+gyi18iY= -=0qtE +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 +=Zx2v -----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/systemd/srcinfo-libnss_systemd.txt b/libre/systemd/srcinfo-libnss_systemd.txt index ec9a543da..0111f2da6 100644 --- a/libre/systemd/srcinfo-libnss_systemd.txt +++ b/libre/systemd/srcinfo-libnss_systemd.txt @@ -1,4 +1,6 @@ libcap.so libm.so +libcrypt.so +libcrypto.so libgcc_s.so libc.so diff --git a/libre/systemd/srcinfo-libsystemd-shared.txt b/libre/systemd/srcinfo-libsystemd-shared.txt index f8790cfdb..e2d55b3a6 100644 --- a/libre/systemd/srcinfo-libsystemd-shared.txt +++ b/libre/systemd/srcinfo-libsystemd-shared.txt @@ -3,7 +3,6 @@ libblkid.so libcap.so libcrypt.so libgcrypt.so -libip4tc.so libkmod.so liblz4.so libmount.so diff --git a/libre/systemd/srcinfo-libsystemd.txt b/libre/systemd/srcinfo-libsystemd.txt index b2506d1ad..dc0de32ee 100644 --- a/libre/systemd/srcinfo-libsystemd.txt +++ b/libre/systemd/srcinfo-libsystemd.txt @@ -1,7 +1,7 @@ libcap.so libgcrypt.so +liblz4.so liblzma.so libzstd.so -liblz4.so libgcc_s.so libc.so diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook index e8fe03330..d64341fd3 100644 --- a/libre/systemd/systemd-hook +++ b/libre/systemd/systemd-hook @@ -17,7 +17,7 @@ systemd_live() { udevd_live() { is_chrooted - if [ ! -d /run/udev ]; then + if [ ! -S /run/udev/control ]; then echo >&2 " Skipped: Device manager is not running." exit 0 fi @@ -26,21 +26,56 @@ udevd_live() { op="$1"; shift case "$op" in - catalog) /usr/bin/journalctl --update-catalog ;; - hwdb) /usr/bin/systemd-hwdb --usr update ;; - update) touch -c /usr ;; - sysusers) /usr/bin/systemd-sysusers ;; - tmpfiles) /usr/bin/systemd-tmpfiles --create ;; - - daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; - udev-reload) udevd_live; /usr/bin/udevadm control --reload; /usr/bin/udevadm trigger ;; - binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; - sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; + binfmt) + systemd_live + /usr/lib/systemd/systemd-binfmt + ;; + catalog) + /usr/bin/journalctl --update-catalog + ;; + daemon-reload-system) + systemd_live + /usr/bin/systemctl --system daemon-reload + ;; + daemon-reload-user) + systemd_live + /usr/bin/systemctl kill --kill-whom='main' --signal='SIGHUP' 'user@*.service' + ;; + hwdb) + /usr/bin/systemd-hwdb --usr update + ;; + sysctl) + systemd_live + /usr/lib/systemd/systemd-sysctl + ;; + sysusers) + /usr/bin/systemd-sysusers + ;; + tmpfiles) + /usr/bin/systemd-tmpfiles --create + ;; + update) + touch -c /usr + ;; + udev-reload) + udevd_live + /usr/bin/udevadm control --reload + if [ ! -e /etc/systemd/do-not-udevadm-trigger-on-update ]; then + /usr/bin/udevadm trigger -c change + /usr/bin/udevadm settle + fi + ;; # For use by other packages - reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;; + reload) + systemd_live + /usr/bin/systemctl try-reload-or-restart "$@" + ;; - *) echo >&2 " Invalid operation '$op'"; exit 1 ;; + *) + echo >&2 " Invalid operation '$op'" + exit 1 + ;; esac exit 0 diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install index 536e54d1b..d5f0a68ff 100644 --- a/libre/systemd/systemd.install +++ b/libre/systemd/systemd.install @@ -15,15 +15,6 @@ post_common() { journalctl --update-catalog } -_242_0_2_changes() { - if [[ -L var/lib/systemd/timesync ]]; then - rm var/lib/systemd/timesync - if [[ -d var/lib/private/systemd/timesync ]]; then - mv var/lib/{private/,}systemd/timesync - fi - fi -} - post_install() { systemd-machine-id-setup @@ -34,7 +25,8 @@ post_install() { # enable some services by default, but don't track them systemctl enable \ getty@tty1.service \ - remote-fs.target + remote-fs.target \ + systemd-userdbd.socket # group 'systemd-journal-remote' is created by systemd-sysusers mkdir -m2755 var/log/journal/remote @@ -46,10 +38,10 @@ post_upgrade() { if sd_booted; then systemctl --system daemon-reexec + systemctl kill --kill-whom='main' --signal='SIGRTMIN+25' 'user@*.service' fi local v upgrades=( - 242.0-2 ) for v in "${upgrades[@]}"; do |