diff options
21 files changed, 658 insertions, 245 deletions
diff --git a/libre/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch index 5ee14d118..b0e9232b8 100644 --- a/libre/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch +++ b/libre/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -1,4 +1,4 @@ -From d817ea1a39a1e5ae78d776708585878dc39f6ec6 Mon Sep 17 00:00:00 2001 +From dec7ae52e9352345e5627d02676b51f2facdd488 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 @@ -8,17 +8,26 @@ 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/sd-bus-errors.xml | 2 +- - man/sd_bus_error_add_map.xml | 2 +- - man/systemd.xml | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) + man/daemon.xml | 4 ++-- + man/journald.conf.xml | 2 +- + man/machinectl.xml | 2 +- + man/sd-bus-errors.xml | 2 +- + man/sd-login.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 | 6 +++--- + 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/man/daemon.xml b/man/daemon.xml -index 485c66225..a64974968 100644 +index 36c7c09db1..730507ed7e 100644 --- a/man/daemon.xml +++ b/man/daemon.xml -@@ -168,7 +168,7 @@ +@@ -144,7 +144,7 @@ <refsect2> <title>New-Style Daemons</title> @@ -27,7 +36,7 @@ index 485c66225..a64974968 100644 new-style daemons. This makes it easier to supervise and control them at runtime and simplifies their implementation.</para> -@@ -309,7 +309,7 @@ +@@ -285,7 +285,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 @@ -36,11 +45,37 @@ index 485c66225..a64974968 100644 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 ee8e8b7faf..28324ac102 100644 +--- a/man/journald.conf.xml ++++ b/man/journald.conf.xml +@@ -111,7 +111,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 will each get their own journal files, and system users will log to + the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are +diff --git a/man/machinectl.xml b/man/machinectl.xml +index affca1dec1..278ca8d677 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -867,7 +867,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 host names +- 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 055af7a68..d2b81f4e4 100644 +index c834bde292..fdd2261fe9 100644 --- a/man/sd-bus-errors.xml +++ b/man/sd-bus-errors.xml -@@ -126,7 +126,7 @@ +@@ -102,7 +102,7 @@ <para>In addition to this list, in sd-bus, the special error namespace <literal>System.Error.</literal> is used to map @@ -49,11 +84,24 @@ index 055af7a68..d2b81f4e4 100644 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-login.xml b/man/sd-login.xml +index 83ef0b7307..93fd9ea782 100644 +--- a/man/sd-login.xml ++++ b/man/sd-login.xml +@@ -244,7 +244,7 @@ + + <para> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> +- for an introduction to multi-seat support on Linux and the background for this set of APIs. ++ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs. + </para> + </refsect1> + diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml -index a1eda21ed..55402dfc2 100644 +index 3eacbab660..b4b3b1bd17 100644 --- a/man/sd_bus_error_add_map.xml +++ b/man/sd_bus_error_add_map.xml -@@ -82,7 +82,7 @@ +@@ -58,7 +58,7 @@ <para>The <function>sd_bus_error_add_map()</function> call may be used to register additional mappings for converting D-Bus errors @@ -62,11 +110,113 @@ index a1eda21ed..55402dfc2 100644 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 02670e1bce..6f4ff77130 100644 +--- a/man/sd_uid_get_state.xml ++++ b/man/sd_uid_get_state.xml +@@ -174,7 +174,7 @@ + <listitem><para>An input parameter was invalid (out of range, + or NULL, where that is not accepted). This is also returned if + the passed user ID is 0xFFFF or 0xFFFFFFFF, which are +- undefined on Linux.</para></listitem> ++ undefined on GNU/Linux.</para></listitem> + </varlistentry> + + <varlistentry> +diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml +index c4763fd561..54bba23666 100644 +--- a/man/systemd-detect-virt.xml ++++ b/man/systemd-detect-virt.xml +@@ -133,12 +133,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 9e84fd8ccb..7f0dcd14d7 100644 +--- a/man/systemd-machine-id-setup.xml ++++ b/man/systemd-machine-id-setup.xml +@@ -58,7 +58,7 @@ + and is different for every booted instance of the + VM.</para></listitem> + +- <listitem><para>Similarly, if run inside a Linux container ++ <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 +diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml +index c895adaaf3..d2dc0538ca 100644 +--- a/man/systemd-resolved.service.xml ++++ b/man/systemd-resolved.service.xml +@@ -47,7 +47,7 @@ + <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> 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 expose DNSSEC ++ 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>). Usage of the + glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry> +@@ -153,7 +153,7 @@ + + <itemizedlist> + <listitem><para><command>systemd-resolved</command> maintains the +- <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux ++ <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux + programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. 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 +@@ -169,7 +169,7 @@ + <command>systemd-resolved</command>. This file does not contain any search domains.</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 definitions. Note that +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index 3bd790b485..a532b74a6e 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -191,7 +191,7 @@ + which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers 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 enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among +- Linux systems.</para> ++ GNU/Linux systems.</para> + + <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is + dynamically allocated at the time the service is started, and released at the time the service is stopped — +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index 19c2ca9907..5fd6c1598f 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -280,7 +280,7 @@ + <listitem><para>Specifies a POSIX message queue name to listen + on. This expects a valid message queue name (i.e. beginning + with /). Behavior otherwise is very similar to the +- <varname>ListenFIFO=</varname> directive above. On Linux ++ <varname>ListenFIFO=</varname> 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 e8178ca4b..ea7dad1ae 100644 +index 17ab59beb5..89086558c7 100644 --- a/man/systemd.xml +++ b/man/systemd.xml -@@ -64,7 +64,7 @@ +@@ -40,7 +40,7 @@ <refsect1> <title>Description</title> @@ -75,6 +225,19 @@ index e8178ca4b..ea7dad1ae 100644 systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services.</para> +@@ -888,10 +888,10 @@ + <title>Kernel Command Line</title> + + <para>When run as system instance systemd parses a number of +- kernel command line arguments<footnote><para>If run inside a Linux ++ kernel command line arguments<footnote><para>If run inside a + container these arguments may be passed as command line arguments + to systemd itself, next to any of the command line options listed +- in the Options section above. If run outside of Linux containers, ++ in the Options section above. If run outside of a container, + these arguments are parsed from <filename>/proc/cmdline</filename> + instead.</para></footnote>:</para> + -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch b/libre/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch new file mode 100644 index 000000000..c511144de --- /dev/null +++ b/libre/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch @@ -0,0 +1,75 @@ +From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001 +Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 6 Mar 2018 23:39:47 +0100 +Subject: [PATCH] Use Arch Linux' device access groups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + cdrom → optical + dialout → uucp + tape → storage +--- + rules/50-udev-default.rules.in | 14 +++++++------- + sysusers.d/basic.conf.in | 6 +++--- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in +index 191f56f42..f81c4d0fc 100644 +--- a/rules/50-udev-default.rules.in ++++ b/rules/50-udev-default.rules.in +@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" +-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" ++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" + + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + +@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" + + SUBSYSTEM=="block", GROUP="disk" +-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" +-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" +-KERNEL=="sch[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd", GROUP="cdrom" ++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical" ++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical" ++KERNEL=="sch[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd", GROUP="optical" + +-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" ++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage" + SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" + KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" + KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" +diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in +index 8e358c02d..33e513a36 100644 +--- a/sysusers.d/basic.conf.in ++++ b/sysusers.d/basic.conf.in +@@ -24,14 +24,14 @@ g utmp - - - + + # Hardware access groups + g audio - - - +-g cdrom - - - +-g dialout - - - + g disk - - - + g input - - - + g kvm - - - + g lp - - - ++g optical - - - + g render - - - +-g tape - - - ++g storage - - - ++g uucp - - - + g video - - - + + # Default group for normal users +-- +2.16.2 + diff --git a/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch index b9e94ee33..1f49c9ee9 100644 --- a/libre/notsystemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch +++ b/libre/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch @@ -1,7 +1,7 @@ -From 10ccaa5d0fb340e61abc158238f939f4f7744396 Mon Sep 17 00:00:00 2001 +From 301445311b5161c61270163c8921b729ab9e10d8 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 to PRETTY_NAME "GNU/Linux" +Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux" instead of "Linux" --- @@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/man/kernel-install.xml b/man/kernel-install.xml -index 94b6b1110..2f42d49d9 100644 +index cd9756662a..9ead6ea39b 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml -@@ -110,7 +110,7 @@ +@@ -88,7 +88,7 @@ <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is @@ -27,10 +27,10 @@ index 94b6b1110..2f42d49d9 100644 the file <filename>initrd</filename> is found next to the <filename>linux</filename> file, the initrd will be added to diff --git a/man/os-release.xml b/man/os-release.xml -index 99bbb6100..27d18749d 100644 +index a51edf3b8a..9ff4b7e8c2 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -210,7 +210,7 @@ +@@ -187,7 +187,7 @@ 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 set, defaults to @@ -40,23 +40,23 @@ index 99bbb6100..27d18749d 100644 Miracle)"</literal>.</para></listitem> </varlistentry> diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c -index ac0470b20..36b01500c 100644 +index de0fe6eba8..9f239c8eeb 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c -@@ -658,7 +658,7 @@ static int analyze_plot(sd_bus *bus) { - svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n"); +@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) { svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times); - svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>", -- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name, -+ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name, - strempty(host->hostname), - strempty(host->kernel_name), - strempty(host->kernel_release), + if (use_full_bus) + svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>", +- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name, ++ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name, + strempty(host->hostname), + strempty(host->kernel_name), + strempty(host->kernel_release), diff --git a/src/core/main.c b/src/core/main.c -index bcf9ea5f2..b66093827 100644 +index 44dd8348be..9a4fc26425 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1264,11 +1264,11 @@ static int status_welcome(void) { +@@ -1234,11 +1234,11 @@ static int status_welcome(void) { return status_printf(NULL, false, false, "\nWelcome to \x1B[%sm%s\x1B[0m!\n", isempty(ansi_color) ? "1" : ansi_color, @@ -71,11 +71,11 @@ index bcf9ea5f2..b66093827 100644 static int write_container_id(void) { diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index bc16290c7..f7574223a 100644 +index a98e53b3a3..41b212e32d 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -97,7 +97,7 @@ static void print_welcome(void) { - log_warning_errno(r, "Failed to read os-release file: %m"); +@@ -87,7 +87,7 @@ static void print_welcome(void) { + "Failed to read os-release file, ignoring: %m"); printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", - isempty(pretty_name) ? "Linux" : pretty_name); @@ -84,10 +84,10 @@ index bc16290c7..f7574223a 100644 press_any_key(); diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install -index a0bca05c9..af9f0f9cc 100644 +index a271cdb8a0..29047ccbff 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install -@@ -38,7 +38,7 @@ elif [[ -f /usr/lib/os-release ]]; then +@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then fi if ! [[ $PRETTY_NAME ]]; then @@ -97,5 +97,5 @@ index a0bca05c9..af9f0f9cc 100644 declare -a BOOT_OPTIONS -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch index 40761d4ef..401d284fd 100644 --- a/libre/notsystemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch +++ b/libre/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch @@ -1,7 +1,7 @@ -From d13b518038bfcdeae9c58bce183751f835cb18d4 Mon Sep 17 00:00:00 2001 +From a6be5d2b2cd02f302ef70c76b601e7af912c3022 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 to NAME "GNU/Linux" instead of +Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of "Linux" --- @@ -10,10 +10,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index 27d18749d..a88d16b17 100644 +index 9ff4b7e8c2..1c069275c8 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -121,7 +121,7 @@ +@@ -98,7 +98,7 @@ <listitem><para>A string identifying the operating system, without a version component, and suitable for presentation to the user. If not set, defaults to @@ -23,10 +23,10 @@ index 27d18749d..a88d16b17 100644 GNU/Linux"</literal>.</para></listitem> </varlistentry> diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c -index 9a1c5b76c..93e5f1ae7 100644 +index 9e77e314ff..3d0c3aafd7 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c -@@ -805,7 +805,7 @@ static int request_handler_machine( +@@ -788,7 +788,7 @@ static int request_handler_machine( SD_ID128_FORMAT_VAL(mid), SD_ID128_FORMAT_VAL(bid), hostname_cleanup(hostname), @@ -36,5 +36,5 @@ index 9a1c5b76c..93e5f1ae7 100644 usage, cutoff_from, -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch index aadcc8a80..58e157b21 100644 --- a/libre/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch +++ b/libre/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -1,4 +1,4 @@ -From 97ace109bae3bd426f8578b7c606004be8234758 Mon Sep 17 00:00:00 2001 +From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 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 @@ -11,10 +11,10 @@ field, so this is just a man page change. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/os-release.xml b/man/os-release.xml -index a88d16b17..caf60f41a 100644 +index 1c069275c8..272258b4e1 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -145,7 +145,7 @@ +@@ -122,7 +122,7 @@ the operating system, excluding any version information and suitable for processing by scripts or usage in generated filenames. If not set, defaults to @@ -24,5 +24,5 @@ index a88d16b17..caf60f41a 100644 <literal>ID=debian</literal>.</para></listitem> </varlistentry> -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch index 475a368be..5e170ce34 100644 --- a/libre/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch +++ b/libre/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch @@ -1,4 +1,4 @@ -From b98fdc685b819dca6f6b3fd9ef49ff4b0ec645af Mon Sep 17 00:00:00 2001 +From 50b001e3d034825142c03e612af9d4a5a307472f 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" @@ -9,10 +9,10 @@ Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux" 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index 9db8b8f61..bcfe3d381 100644 +index 01372fc66b..9155ce5c2e 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c -@@ -383,10 +383,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char +@@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char static const char *fallback_hostname(void) { /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be @@ -26,5 +26,5 @@ index 9db8b8f61..bcfe3d381 100644 return FALLBACK_HOSTNAME; } -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 145e45d4b..0905e6bad 100644 --- a/libre/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -1,18 +1,18 @@ -From 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001 +From 35af892f1dffbb0daa9aa721f908f7c38b064ebe 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/os-release.xml | 49 +++++++++++++++++++++++++------------------------ - man/systemd-nspawn.xml | 34 ++++++++++++++++++---------------- - 2 files changed, 43 insertions(+), 40 deletions(-) + man/os-release.xml | 49 +++++++++++++++++++++-------------------- + man/systemd-nspawn.xml | 50 +++++++++++++++++++++++------------------- + 2 files changed, 52 insertions(+), 47 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index caf60f41a..2811f434c 100644 +index 272258b4e1..6cea40cb99 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -122,7 +122,7 @@ +@@ -99,7 +99,7 @@ without a version component, and suitable for presentation to the user. If not set, defaults to <literal>NAME=GNU/Linux</literal>. Example: @@ -21,7 +21,7 @@ index caf60f41a..2811f434c 100644 GNU/Linux"</literal>.</para></listitem> </varlistentry> -@@ -133,8 +133,8 @@ +@@ -110,8 +110,8 @@ version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user. This field is optional. Example: @@ -32,7 +32,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -146,8 +146,8 @@ +@@ -123,8 +123,8 @@ suitable for processing by scripts or usage in generated filenames. If not set, defaults to <literal>ID=gnu-linux</literal>. Example: @@ -43,7 +43,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -168,9 +168,9 @@ +@@ -145,9 +145,9 @@ should be listed in order of how closely the local operating system relates to the listed ones, starting with the closest. This field is optional. Example: for an operating system with @@ -55,7 +55,7 @@ index caf60f41a..2811f434c 100644 assignment of <literal>ID_LIKE=debian</literal> is appropriate.</para></listitem> </varlistentry> -@@ -199,8 +199,8 @@ +@@ -176,8 +176,8 @@ identifying the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated filenames. This @@ -66,7 +66,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -211,8 +211,8 @@ +@@ -188,8 +188,8 @@ a release code name or OS version of some kind, as suitable. If not set, defaults to <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: @@ -77,7 +77,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -235,7 +235,7 @@ +@@ -212,7 +212,7 @@ <ulink url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as proposed by the NIST. This field is optional. Example: @@ -86,7 +86,7 @@ index caf60f41a..2811f434c 100644 </para></listitem> </varlistentry> -@@ -270,8 +270,8 @@ +@@ -247,8 +247,8 @@ one URL shall be listed in each setting. If multiple resources need to be referenced, it is recommended to provide an online landing page linking all available resources. Examples: @@ -97,7 +97,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -346,21 +346,22 @@ +@@ -323,21 +323,22 @@ recommended to prefix new fields with an OS specific name in order to avoid name clashes. Applications reading this file must ignore unknown fields. Example: @@ -131,23 +131,33 @@ index caf60f41a..2811f434c 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index ae7082776..ef80d90ba 100644 +index 284c9b294b..7b3d211161 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1048,10 +1048,11 @@ +@@ -1,7 +1,7 @@ + <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> + <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +-<!ENTITY fedora_latest_version "28"> ++<!ENTITY blag_latest_version "140"> + <!ENTITY fedora_cloud_release "1.1"> + ]> + +@@ -1176,11 +1176,12 @@ <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 Fedora image and start a shell in it</title> + <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/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz - # systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting> + 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 + # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting> -@@ -1059,39 +1060,40 @@ +@@ -1188,31 +1189,32 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -157,27 +167,33 @@ index ae7082776..ef80d90ba 100644 - <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=25 --installroot=/srv/mycontainer \ +- <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \ - --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ - systemd passwd dnf fedora-release vim-minimal -+ <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \ +-# 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 - # systemd-nspawn -bD /srv/mycontainer</programlisting> ++# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting> - <para>This installs a minimal Fedora distribution into the +- directory <filename noindex='true'>/var/lib/machines/f&fedora_latest_version;</filename> + <para>This installs a minimal BLAG distribution into the - directory <filename noindex='true'>/srv/mycontainer/</filename> - and then boots an OS in a namespace container in it.</para> ++ directory <filename noindex='true'>/var/lib/machines/blag&blag_latest_version;</filename> + and then boots an OS in a namespace container in it. 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 Ucclia distribution</title> -- <programlisting># debootstrap --arch=amd64 unstable ~/debian-tree/ +- <programlisting># debootstrap unstable ~/debian-tree/ -# systemd-nspawn -D ~/debian-tree/</programlisting> -+ <programlisting># debootstrap --arch=amd64 ucclia ~/gnewsense-tree/ ++ <programlisting># debootstrap ucclia ~/gnewsense-tree/ +# systemd-nspawn -D ~/gnewsense-tree/</programlisting> - <para>This installs a minimal Debian unstable distribution into @@ -185,11 +201,14 @@ index ae7082776..ef80d90ba 100644 + <para>This installs a minimal gNewSense unstable distribution into + the directory <filename>~/gnewsense-tree/</filename> and then spawns a shell in a namespace container in it.</para> - </example> + + <para><command>debootstrap</command> supports +@@ -1227,29 +1229,31 @@ <example> -- <title>Boot a minimal Arch Linux distribution in a container</title> -+ <title>Boot a minimal Parabola distribution in a container</title> + <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 -d ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/</programlisting> @@ -203,6 +222,27 @@ index ae7082776..ef80d90ba 100644 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.13.2 +2.18.0 diff --git a/libre/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch index 2ca860d87..0fe5def3c 100644 --- a/libre/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch +++ b/libre/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch @@ -1,4 +1,4 @@ -From c2357a5265d49410d3aacef1ccacb9b0caf761a5 Mon Sep 17 00:00:00 2001 +From 31e5d50f17d3993839d8f7c9f344a620e3871812 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 @@ -9,10 +9,10 @@ Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c -index 155bf278b..297dcb535 100644 +index 2832a39dd7..534870ee50 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c -@@ -778,13 +778,13 @@ static int install_variables(const char *esp_path, +@@ -665,13 +665,13 @@ static int install_variables(const char *esp_path, "Failed to determine current boot order: %m"); if (first || r == 0) { @@ -29,5 +29,5 @@ index 155bf278b..297dcb535 100644 return insert_into_order(slot, first); -- -2.13.2 +2.18.0 diff --git a/libre/notsystemd/PKGBUILD b/libre/notsystemd/PKGBUILD index f8c8b88bf..6a123681a 100644 --- a/libre/notsystemd/PKGBUILD +++ b/libre/notsystemd/PKGBUILD @@ -1,36 +1,41 @@ -# Maintainer (Arch): Christian Hesse <mail@eworm.de> -# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> -# Maintainer (Arch): Tom Gundersen <teg@jklm.no> -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch:systemd): Christian Hesse <mail@eworm.de> +# Maintainer (Arch:systemd): Dave Reisner <dreisner@archlinux.org> +# Maintainer (Arch:systemd): Tom Gundersen <teg@jklm.no> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> +# Justification for being in [libre]: Potential dependency of +# libretools. + _pkgbase=systemd -# latest commit on stable branch -_commit='d52e2bb9c20216972754c054e8534bca28baab66' -# Bump this to latest major release for signed tag verification, -# the commit count is handled by pkgver() function. -_pkgver=234.11 -_pkgrel=8 -_pkgrel+=.parabola3 - -pkgname=notsystemd -pkgver=234.1 +# Can be from either systemd or systemd-stable +_commit='de7436b02badc82200dc127ff190b8155769b8e7' +_pkgver=239.0 + +pkgbase=notsystemd +# Include only split packages that link against libsystemd-shared-XXX.so +pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-resolvconf' 'notsystemd-common') +pkgver=239.1 pkgrel=1 -arch=('i686' 'x86_64') -arch+=('armv7h') +arch=('x86_64') +arch+=('i686' 'armv7h') url="https://repo.parabola.nu/other/${pkgname}" -license=('GPL2' 'LGPL2.1') makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' 'python-lxml' 'quota-tools' 'shadow' 'git' - 'meson' 'libseccomp') + 'meson' 'libseccomp' 'pcre2') makedepends_i686=('gnu-efi-libs') makedepends_x86_64=('gnu-efi-libs') options=('strip') -source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}" - 'git://github.com/systemd/systemd.git' # pull in for tags - "https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} +validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> + '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E' # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> + '99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker +source=(# fragment is latest tag for source verification, final merge in prepare() + "git+https://github.com/systemd/systemd-stable#tag=v${_pkgver%.*}?signed" + "git+https://github.com/systemd/systemd#tag=v${_pkgver%.*}?signed" + '0001-Use-Arch-Linux-device-access-groups.patch' + "https://repo.parabola.nu/other/${pkgname}/${pkgbase}-${pkgver}.tar.gz"{,.sig} 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' @@ -38,108 +43,80 @@ source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}" 'loader.conf' 'splash-parabola.bmp' 'systemd-user.pam' + 'systemd-hook' + 'udev-hook' + 'systemd-binfmt.hook' + 'systemd-catalog.hook' + 'systemd-daemon-reload.hook' 'systemd-hwdb.hook' + 'systemd-sysctl.hook' 'systemd-sysusers.hook' 'systemd-tmpfiles.hook' + 'systemd-udev-reload.hook' 'systemd-update.hook' '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' - '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch' - '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.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') sha512sums=('SKIP' 'SKIP' - '6e75173430fb2bc02a560bdc23f30586e960826e31e17bb9db5cbe1c25d037bcde47b01f686fe4b7af810f0d866b55cf04874b013cde1c61d8c6feea780f2b65' + '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' + '0b3cfe7b3bd722aad4f3c4b3d5f66e604da6b150587c71338f0265757867c0cb5ff4956732187e3124e09dfe7a8929dfc04ec9b3948aa805c121de0c04715d75' 'SKIP' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159' + '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c' 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - '2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda' - '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30' - 'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3' - '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618' - 'e85c5564348253e1bc49d943f0456c38ebef0c50a5a7782ea6ebb1f45bd624a69430d79693fe1223b0adace9f07c167b84133a003a09a8b61ae48d1b70610277' - '0ad718e9441798a4479600ffce364c2f0e582fd0ccf7762dde90f99755dee4569bcee8299ea2ccbf3a010966c8d48c59fcd0b1f93c9b8a479332c2c128fc2b2a' - '03ec8cfde36a0a7413993118707e32b0d8b693d366da8cb22a6e71e1c10178d1df05b2e2d1d5a2a298d49af005f3cdf80bfd8d40959d3e53310491b6ada39fed' - '9c13df718d4db2592c50c348c7b6340bbd7dd6ee6951da0f2bbd9c1878e0f034b975dfa9b28081b57e76f91c49f0bbcce314d0baaf1c5916dcff11e98d426372' - 'b45c4e40f626a02951a852ea4cd2304f00a172dc64b5c38a97f5c68e4a89ceb4f4164cc9221533c4a5c52662e0b9629a82c521514bfcc21f0c11ce517643c2c1' - 'f5c4cbeecac8f9d8f009deb4ac1d0b797210bcd1a91fcc6bf8ec110320ad6ceb8fd2a28b184ca037d73078d09a22f224ad3fc46f4bbf972432cce23263b2e1dc' - 'e276fd1aedd7718333324fa9d99493fe99d951f446e3b590a99e2cc9562a0bd0e29693907997cb52096c39168c5be62ded3feedf93bacd3c9659d58775b6ca8d') -validpgpkeys=( - '63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering - '99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker -) + '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40' + 'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d' + '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8' + '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb' + '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2' + '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc' + 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a' + '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763' + '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447' + 'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6' + '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67' + 'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568' + 'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38' + 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67' + 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' + '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30' + 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83' + '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( - # cryptsetup: fix infinite timeout (#6486) - '0864d311766498563331f486909a0d950ba7de87' - - # process-util: add getpid_cached() as a caching wrapper for getpid() - '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47' - # tree-wide: make use of getpid_cached() wherever we can - 'df0ff127758809a45105893772de76082d12a26d' - - # call chase_symlinks without the /sysroot prefix (#6411) (FS#54958) - '98eda38aed6a10c4f6d6ad0cac6e5361e87de52b' ) _reverts=( ) -_validate_tag() { - local success fingerprint trusted status tag=v${_pkgver%.*} - - parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1) - - if (( ! success )); then - error 'failed to validate tag %s\n' "$tag" - return 1 - fi - - if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then - error 'unknown or untrusted public key: %s\n' "$fingerprint" - return 1 - fi - - case $status in - 'expired') - warning 'the signature has expired' - ;; - 'expiredkey') - warning 'the key has expired' - ;; - esac - - return 0 -} - prepare() { cd "$_pkgbase-stable" - git remote add upstream ../systemd/ - git fetch --all - - _validate_tag || return + # add upstream repository for cherry-picking + git remote add -f upstream ../systemd + # merge the latest stable commit (fast-foward only to make sure + # the verified tag is in) + git merge --ff-only "${_commit}" - local _commit - for _commit in "${_backports[@]}"; do - git cherry-pick -n "$_commit" + local c + for c in "${_backports[@]}"; do + git cherry-pick -n "$c" done - for _commit in "${_reverts[@]}"; do - git revert -n "$_commit" + for c in "${_reverts[@]}"; do + git revert -n "$c" done - # core: store the invocation ID in the per-service keyring - # core: run each system service with a fresh session keyring - git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \ - '74dd6b515fa968c5710b396a7664cac335e25ca8' \ - -- . ':!src/test/test-id128.c' | git apply --reverse --index + # Replace cdrom/dialout/tape groups with optical/uucp/storage + patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch # apply FSDG patches local _patch @@ -151,8 +128,6 @@ prepare() { for _patch in "$srcdir/$pkgname-$pkgver"/????-*.patch; do patch -Np1 -i "$_patch" done - - ./autogen.sh } build() { @@ -165,9 +140,6 @@ build() { fi local meson_options=( - --buildtype=release - -Db_lto=true - -Daudit=false -Dima=false -Dlz4=true @@ -187,7 +159,7 @@ build() { meson_options+=(-Dgnuefi=true) fi - meson "$_pkgbase-stable" build "${meson_options[@]}" + arch-meson "$_pkgbase-stable" build "${meson_options[@]}" ninja -C build @@ -198,6 +170,9 @@ build() { # Put things in the main systemd package by default DESTDIR="$srcdir/dest/systemd" ninja -C build install + install -dm755 "$srcdir/dest/common"/usr/lib/systemd + mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so + 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 @@ -210,6 +185,14 @@ build() { 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/ + 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/ + while read -d '' -r file; do + install -dm755 "$srcdir/dest/udev/${file%/*}" + mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file" + done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0') + local nssmodule for nssmodule in systemd myhostname mymachines resolve; do install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} @@ -220,20 +203,26 @@ build() { done install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 - mv "$srcdir/dest/systemd"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include} } -package() { - pkgdesc="system and service manager" - depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' - 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' - 'util-linux' 'xz') - provides=("systemd-tools=$_pkgver" "udev=$_pkgver") - replaces=('systemd-tools' 'udev') - conflicts=('systemd-tools' 'udev') +check() { + cd build + meson test +} + +package_notsystemd() { + pkgdesc='system and service manager' + license=('LGPL2.1') + depends=('bash' 'dbus' 'kbd' 'kmod' + 'libsystemd' 'pam' 'libelf' + 'util-linux' 'pcre2') + depends+=("notsystemd-common=$pkgver" 'udev') + provides=("systemd-tools=$_pkgver") + conflicts=('systemd-tools') optdepends=('libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' @@ -247,67 +236,117 @@ package() { etc/systemd/system.conf etc/systemd/timesyncd.conf etc/systemd/resolved.conf - etc/systemd/user.conf - etc/udev/udev.conf) - install="systemd.install" + etc/systemd/user.conf) + install=systemd.install pkgdesc+=", modified to work with other init systems" - conflicts+=("$_pkgbase") - provides+=("$_pkgbase=$_pkgver-$_pkgrel") + provides+=("${pkgname#not}=$_pkgver") + conflicts+=("${pkgname#not}") - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#not}" "$pkgdir" # don't write units to /etc by default. some of these will be re-enabled on # post_install. - rm -r "$pkgdir/etc/systemd/system/"*.wants - rm -r "$pkgdir/etc/systemd/system/"*.service + rm -rv "$pkgdir"/etc/systemd/system/* - # add back tmpfiles.d/legacy.conf - install -m644 "$_pkgbase-stable/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - sed -i 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules - sed -i 's/dialout/uucp/g; - s/tape/storage/g; - s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf + # we'll create this on installation + rmdir "$pkgdir"/var/log/journal/remote - # add mkinitcpio hooks - install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" - install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" - install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + # executable (symlinks) shipped with systemd-sysvcompat + rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} - # ensure proper permissions for /var/log/journal. This is only to placate - chown root:systemd-journal "$pkgdir/var/log/journal" - chmod 2755 "$pkgdir/var/log/journal" + # files shipped with systemd-resolvconf + rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} - # match directory owner/group and mode from extra/polkit - chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d - chmod 0750 "$pkgdir"/usr/share/polkit-1/rules.d + # avoid a potential conflict with [core]/filesystem + rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf + sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf - # we'll create this on installation - rmdir "$pkgdir/var/log/journal/remote" + # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat + install -m0644 $_pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - # allow core/filesystem to pristine nsswitch.conf - rm "$pkgdir/usr/share/factory/etc/nsswitch.conf" - sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf" + # add mkinitcpio hooks + install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd + + # ensure proper permissions for /var/log/journal + # The permissions are stored with named group by tar, so this works with + # users and groups populated by systemd-sysusers. This is only to prevent a + # warning from pacman as permissions are set by systemd-tmpfiles anyway. + install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal + + # 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 -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf - install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp + install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf + install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp - install -Dm644 "$srcdir/systemd-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook" - install -Dm644 "$srcdir/systemd-sysusers.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook" - install -Dm644 "$srcdir/systemd-tmpfiles.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook" - install -Dm644 "$srcdir/systemd-update.hook" "$pkgdir/usr/share/libalpm/hooks/systemd-update.hook" + # pacman hooks + install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook + install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook + rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}* # overwrite the systemd-user PAM configuration with our own - install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user" + install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user } -# vim: ft=sh syn=sh et +package_notsystemd-common() { + pkgdesc='systemd files shared between split packages' + license=('LGPL2.1') + depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap' + 'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so' + 'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4' + 'xz') + + pkgdesc="not${pkgdesc}" + conflicts+=("${pkgname#not}") + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir" +} + +package_notsystemd-udev() { + pkgdesc='Userspace device file manager' + license=('GPL2') # NB: different than the rest + groups=('base') + depends=("notsystemd-common=$pkgver" 'systemd-libudev' + 'hwids' 'kmod' 'util-linux' 'zlib') + backup=(etc/udev/udev.conf) + + provides+=("${pkgname#notsystemd-}=$_pkgver") + conflicts+=("${pkgname#notsystemd-}") + + provides+=("${pkgname#not}=$_pkgver") + conflicts+=("${pkgname#not}") + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$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 + + # pacman hooks + install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook + install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook +} + +package_notsystemd-resolvconf() { + pkgdesc='systemd resolvconf replacement' + license=('LGPL2.1') + depends=('notsystemd' "notsystemd-common=$pkgver") + provides=('openresolv' 'resolvconf') + conflicts=('openresolv') + + pkgdesc="not${pkgdesc}" + provides+=("${pkgname#not}=$_pkgver") + conflicts+=("${pkgname#not}") + + 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 +} diff --git a/libre/notsystemd/initcpio-install-systemd b/libre/notsystemd/initcpio-install-systemd index 5bf7b7f16..8fb4441f7 100644 --- a/libre/notsystemd/initcpio-install-systemd +++ b/libre/notsystemd/initcpio-install-systemd @@ -112,11 +112,15 @@ build() { map add_binary \ /usr/bin/systemd-tmpfiles \ /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/systemd-shutdown \ /usr/lib/systemd/systemd-sulogin-shell \ /usr/lib/systemd/system-generators/systemd-fstab-generator \ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + # for journalctl in emergency shell + add_binary journalctl + # udev rules and systemd units map add_udev_rule "$rules" \ 50-udev-default.rules \ @@ -181,7 +185,7 @@ EOF ( . "$_f_config" set -f - printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf" + printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" ) } diff --git a/libre/notsystemd/systemd-binfmt.hook b/libre/notsystemd/systemd-binfmt.hook new file mode 100644 index 000000000..9c31a4b16 --- /dev/null +++ b/libre/notsystemd/systemd-binfmt.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/binfmt.d/*.conf + +[Action] +Description = Registering binary formats... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook binfmt diff --git a/libre/notsystemd/systemd-catalog.hook b/libre/notsystemd/systemd-catalog.hook new file mode 100644 index 000000000..d28bddc4b --- /dev/null +++ b/libre/notsystemd/systemd-catalog.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/catalog/* + +[Action] +Description = Updating journal message catalog... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook catalog diff --git a/libre/notsystemd/systemd-daemon-reload.hook b/libre/notsystemd/systemd-daemon-reload.hook new file mode 100644 index 000000000..87923e862 --- /dev/null +++ b/libre/notsystemd/systemd-daemon-reload.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/system/* + +[Action] +Description = Reloading system manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload diff --git a/libre/notsystemd/systemd-hook b/libre/notsystemd/systemd-hook new file mode 100644 index 000000000..793a42943 --- /dev/null +++ b/libre/notsystemd/systemd-hook @@ -0,0 +1,23 @@ +#!/bin/sh -e + +systemd_live() { + if [ ! -d /run/systemd/system ]; then + echo >&2 " Skipped: Current root is not booted." + exit 0 + fi +} + +case $1 in + catalog) /usr/bin/journalctl --update-catalog ;; + update) touch -c /usr ;; + sysusers) /usr/bin/systemd-sysusers ;; + tmpfiles) /usr/bin/systemd-tmpfiles --create ;; + + daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; + binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; + sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; + + *) echo >&2 " Invalid operation '$1'"; exit 1 ;; +esac + +exit 0 diff --git a/libre/notsystemd/systemd-hwdb.hook b/libre/notsystemd/systemd-hwdb.hook index d7c987724..ec5bcfb94 100644 --- a/libre/notsystemd/systemd-hwdb.hook +++ b/libre/notsystemd/systemd-hwdb.hook @@ -8,4 +8,4 @@ Target = usr/lib/udev/hwdb.d/* [Action] Description = Updating udev hardware database... When = PostTransaction -Exec = /usr/bin/systemd-hwdb --usr update +Exec = /usr/share/libalpm/scripts/udev-hook hwdb diff --git a/libre/notsystemd/systemd-sysctl.hook b/libre/notsystemd/systemd-sysctl.hook new file mode 100644 index 000000000..aec5ac1b0 --- /dev/null +++ b/libre/notsystemd/systemd-sysctl.hook @@ -0,0 +1,10 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = usr/lib/sysctl.d/*.conf + +[Action] +Description = Applying kernel sysctl settings... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook sysctl diff --git a/libre/notsystemd/systemd-sysusers.hook b/libre/notsystemd/systemd-sysusers.hook index 6b8affa16..9873dd402 100644 --- a/libre/notsystemd/systemd-sysusers.hook +++ b/libre/notsystemd/systemd-sysusers.hook @@ -5,7 +5,6 @@ Operation = Upgrade Target = usr/lib/sysusers.d/*.conf [Action] -Description = Updating system user accounts... +Description = Creating system user accounts... When = PostTransaction -Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "$(basename "$f")" ; done' -NeedsTargets +Exec = /usr/share/libalpm/scripts/systemd-hook sysusers diff --git a/libre/notsystemd/systemd-tmpfiles.hook b/libre/notsystemd/systemd-tmpfiles.hook index 18cdd9180..df60d8275 100644 --- a/libre/notsystemd/systemd-tmpfiles.hook +++ b/libre/notsystemd/systemd-tmpfiles.hook @@ -7,5 +7,4 @@ Target = usr/lib/tmpfiles.d/*.conf [Action] Description = Creating temporary files... When = PostTransaction -Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create "$(basename "$f")"; done' -NeedsTargets +Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles diff --git a/libre/notsystemd/systemd-udev-reload.hook b/libre/notsystemd/systemd-udev-reload.hook new file mode 100644 index 000000000..418515daf --- /dev/null +++ b/libre/notsystemd/systemd-udev-reload.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/rules.d/* + +[Action] +Description = Reloading device manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/udev-hook udev-reload diff --git a/libre/notsystemd/systemd-update.hook b/libre/notsystemd/systemd-update.hook index 3697fbd70..7084a0c16 100644 --- a/libre/notsystemd/systemd-update.hook +++ b/libre/notsystemd/systemd-update.hook @@ -8,4 +8,4 @@ Target = usr/ [Action] Description = Arming ConditionNeedsUpdate... When = PostTransaction -Exec = /usr/bin/touch -c /usr +Exec = /usr/share/libalpm/scripts/systemd-hook update diff --git a/libre/notsystemd/udev-hook b/libre/notsystemd/udev-hook new file mode 100644 index 000000000..61d853293 --- /dev/null +++ b/libre/notsystemd/udev-hook @@ -0,0 +1,18 @@ +#!/bin/sh -e + +udevd_live() { + if [ ! -d /run/udev ]; then + echo >&2 " Skipped: Device manager is not running." + exit 0 + fi +} + +case $1 in + hwdb) /usr/bin/systemd-hwdb --usr update ;; + + udev-reload) udevd_live; /usr/bin/udevadm control --reload ;; + + *) echo >&2 " Invalid operation '$1'"; exit 1 ;; +esac + +exit 0 |