From c80e1c12f5ff6fad17707c57af04150c5dc1d6e0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 14 Jun 2016 05:46:38 -0300 Subject: systemd-knock-230-4: updating version --- ...efer-to-the-operating-system-as-GNU-Linux.patch | 80 ++++ ...ease-Default-to-PRETTY_NAME-GNU-Linux-ins.patch | 101 +++++ ...ease-Default-to-NAME-GNU-Linux-instead-of.patch | 40 ++ ...ease-Default-ID-to-gnu-linux-instead-of-l.patch | 28 ++ ...d-resolved-Default-to-hostname-gnu-linux-.patch | 33 ++ ...an-Use-FSDG-operating-systems-as-examples.patch | 199 +++++++++ pcr/systemd-knock/PKGBUILD | 220 ++++++--- pcr/systemd-knock/gnu+linux.patch | 493 --------------------- pcr/systemd-knock/udev-hwdb.hook | 11 + 9 files changed, 654 insertions(+), 551 deletions(-) create mode 100644 pcr/systemd-knock/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch create mode 100644 pcr/systemd-knock/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch create mode 100644 pcr/systemd-knock/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch create mode 100644 pcr/systemd-knock/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch create mode 100644 pcr/systemd-knock/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch create mode 100644 pcr/systemd-knock/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch delete mode 100644 pcr/systemd-knock/gnu+linux.patch create mode 100644 pcr/systemd-knock/udev-hwdb.hook (limited to 'pcr') diff --git a/pcr/systemd-knock/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/pcr/systemd-knock/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch new file mode 100644 index 000000000..e91d0afd8 --- /dev/null +++ b/pcr/systemd-knock/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -0,0 +1,80 @@ +From 64713f35b5a75b441ab300813ff5a48b0bffed92 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:19:20 -0400 +Subject: [PATCH 1/6] 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/sd-bus-errors.xml | 2 +- + man/sd_bus_error_add_map.xml | 2 +- + man/systemd.xml | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/man/daemon.xml b/man/daemon.xml +index b6125cb..f74fd35 100644 +--- a/man/daemon.xml ++++ b/man/daemon.xml +@@ -168,7 +168,7 @@ + + New-Style Daemons + +- Modern services for Linux should be implemented as ++ 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. + +@@ -311,7 +311,7 @@ + as detailed in the LSB + Linux Standard Base Core Specification. 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/sd-bus-errors.xml b/man/sd-bus-errors.xml +index 055af7a..d2b81f4 100644 +--- a/man/sd-bus-errors.xml ++++ b/man/sd-bus-errors.xml +@@ -126,7 +126,7 @@ + + In addition to this list, in sd-bus, the special error + namespace System.Error. is used to map +- arbitrary Linux system errors (as defined by errno3) + to D-Bus errors and back. For example, the error + EUCLEAN is mapped to +diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml +index 139bd77..7dc1ef6 100644 +--- a/man/sd_bus_error_add_map.xml ++++ b/man/sd_bus_error_add_map.xml +@@ -82,7 +82,7 @@ + + The sd_bus_error_add_map() call may be + used to register additional mappings for converting D-Bus errors +- to Linux errno-style errors. The mappings ++ to GNU/Linux errno-style errors. The mappings + defined with this call are consulted by calls such as + sd_bus_error_set3 + or +diff --git a/man/systemd.xml b/man/systemd.xml +index b8d91b8..e05a9d6 100644 +--- a/man/systemd.xml ++++ b/man/systemd.xml +@@ -61,7 +61,7 @@ + + Description + +- systemd is a system and service manager for Linux operating ++ 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. +-- +2.8.3 + diff --git a/pcr/systemd-knock/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/pcr/systemd-knock/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch new file mode 100644 index 000000000..59ab5bee4 --- /dev/null +++ b/pcr/systemd-knock/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch @@ -0,0 +1,101 @@ +From d6a67e5ff7d99af484a9ebf68d3fe2510bffd099 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:23:40 -0400 +Subject: [PATCH 2/6] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" + instead of "Linux". + +--- + man/kernel-install.xml | 2 +- + man/os-release.xml | 2 +- + src/analyze/analyze.c | 2 +- + src/core/main.c | 4 +- + src/firstboot/firstboot.c | 2 +- + src/kernel-install/90-loaderentry.install | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/man/kernel-install.xml b/man/kernel-install.xml +index d7e27de..eb51918 100644 +--- a/man/kernel-install.xml ++++ b/man/kernel-install.xml +@@ -106,7 +106,7 @@ + PRETTY_NAME parameter specified + in /etc/os-release or + /usr/lib/os-release (if the former is +- missing), or "Linux ++ missing), or "GNU/Linux + KERNEL-VERSION", if unset. If + the file initrd is found next to the + linux file, the initrd will be added to +diff --git a/man/os-release.xml b/man/os-release.xml +index 4557abc..767a1c7 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -194,7 +194,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 +- PRETTY_NAME="Linux". Example: ++ PRETTY_NAME="GNU/Linux". Example: + PRETTY_NAME="Fedora 17 (Beefy + Miracle)". + +diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c +index d621f66..53c97f9 100644 +--- a/src/analyze/analyze.c ++++ b/src/analyze/analyze.c +@@ -653,7 +653,7 @@ static int analyze_plot(sd_bus *bus) { + svg("\n"); + svg("%s", pretty_times); + svg("%s %s (%s %s %s) %s %s", +- 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 93098da..b9cac92 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1238,11 +1238,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, +- isempty(pretty_name) ? "Linux" : pretty_name); ++ isempty(pretty_name) ? "GNU/Linux" : pretty_name); + else + return status_printf(NULL, false, false, + "\nWelcome to %s!\n", +- isempty(pretty_name) ? "Linux" : pretty_name); ++ isempty(pretty_name) ? "GNU/Linux" : pretty_name); + } + + static int write_container_id(void) { +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index 3df7246..1e1a592 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -96,7 +96,7 @@ static void print_welcome(void) { + log_warning_errno(r, "Failed to read os-release file: %m"); + + printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", +- isempty(pretty_name) ? "Linux" : pretty_name); ++ isempty(pretty_name) ? "GNU/Linux" : pretty_name); + + press_any_key(); + +diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install +index 4c9b1f0..6e94e12 100644 +--- a/src/kernel-install/90-loaderentry.install ++++ b/src/kernel-install/90-loaderentry.install +@@ -37,7 +37,7 @@ elif [[ -f /usr/lib/os-release ]]; then + fi + + if ! [[ $PRETTY_NAME ]]; then +- PRETTY_NAME="Linux $KERNEL_VERSION" ++ PRETTY_NAME="GNU/Linux $KERNEL_VERSION" + fi + + declare -a BOOT_OPTIONS +-- +2.8.3 + diff --git a/pcr/systemd-knock/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/pcr/systemd-knock/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch new file mode 100644 index 000000000..d6c40587d --- /dev/null +++ b/pcr/systemd-knock/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch @@ -0,0 +1,40 @@ +From 20c90fb1a90a1702ce5e7d79dd16ee160640a1ee Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:24:56 -0400 +Subject: [PATCH 3/6] FSDG: os-release: Default to NAME "GNU/Linux" instead of + "Linux". + +--- + man/os-release.xml | 2 +- + src/journal-remote/journal-gatewayd.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 767a1c7..f6787f9 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -121,7 +121,7 @@ + A string identifying the operating system, + without a version component, and suitable for presentation to + the user. If not set, defaults to +- NAME=Linux. Example: ++ NAME=GNU/Linux. Example: + NAME=Fedora or NAME="Debian + GNU/Linux". + +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index 60d8977..3b9adb5 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -799,7 +799,7 @@ static int request_handler_machine( + SD_ID128_FORMAT_VAL(mid), + SD_ID128_FORMAT_VAL(bid), + hostname_cleanup(hostname), +- os_name ? os_name : "Linux", ++ os_name ? os_name : "GNU/Linux", + v ? v : "bare", + usage, + cutoff_from, +-- +2.8.3 + diff --git a/pcr/systemd-knock/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/pcr/systemd-knock/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch new file mode 100644 index 000000000..8a130ab78 --- /dev/null +++ b/pcr/systemd-knock/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -0,0 +1,28 @@ +From 6f4e352372876053efb168e6dc9e74a57c8d6c2e Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:28:30 -0400 +Subject: [PATCH 4/6] FSDG: os-release: Default ID to "gnu-linux" instead of + "linux". + +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(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index f6787f9..79eb402 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -145,7 +145,7 @@ + the operating system, excluding any version information and + suitable for processing by scripts or usage in generated + filenames. If not set, defaults to +- ID=linux. Example: ++ ID=gnu-linux. Example: + ID=fedora or + ID=debian. + +-- +2.8.3 + diff --git a/pcr/systemd-knock/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch b/pcr/systemd-knock/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch new file mode 100644 index 000000000..f5e9de8fc --- /dev/null +++ b/pcr/systemd-knock/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch @@ -0,0 +1,33 @@ +From 71b8c10050db1a16402e0600c9921b012c908b44 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:31:20 -0400 +Subject: [PATCH 5/6] FSDG: systemd-resolved: Default to hostname "gnu-linux" + instead of "linux" + +--- + src/resolve/resolved-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c +index 7f90734..e82c6ec 100644 +--- a/src/resolve/resolved-manager.c ++++ b/src/resolve/resolved-manager.c +@@ -429,12 +429,12 @@ static int manager_watch_hostname(Manager *m) { + + r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname); + if (r < 0) { +- log_info("Defaulting to hostname 'linux'."); +- m->llmnr_hostname = strdup("linux"); ++ log_info("Defaulting to hostname 'gnu-linux'."); ++ m->llmnr_hostname = strdup("gnu-linux"); + if (!m->llmnr_hostname) + return log_oom(); + +- m->mdns_hostname = strdup("linux.local"); ++ m->mdns_hostname = strdup("gnu-linux.local"); + if (!m->mdns_hostname) + return log_oom(); + } else +-- +2.8.3 + diff --git a/pcr/systemd-knock/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/pcr/systemd-knock/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch new file mode 100644 index 000000000..82d60ec94 --- /dev/null +++ b/pcr/systemd-knock/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -0,0 +1,199 @@ +From 566cac15ed36506e2bb766313a5d4e0825bc6499 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:32:21 -0400 +Subject: [PATCH 6/6] FSDG: man/: Use FSDG operating systems as examples. + +--- + man/os-release.xml | 49 +++++++++++++++++++++++++------------------------ + man/systemd-nspawn.xml | 37 +++++++++++++------------------------ + 2 files changed, 38 insertions(+), 48 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 79eb402..a70ba1a 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -122,7 +122,7 @@ + without a version component, and suitable for presentation to + the user. If not set, defaults to + NAME=GNU/Linux. Example: +- NAME=Fedora or NAME="Debian ++ NAME=BLAG or NAME="gNewSense + GNU/Linux". + + +@@ -133,8 +133,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: +- VERSION=17 or VERSION="17 (Beefy +- Miracle)". ++ VERSION=210k or VERSION="210k ++ (Spartakus)". + + + +@@ -146,8 +146,8 @@ + suitable for processing by scripts or usage in generated + filenames. If not set, defaults to + ID=gnu-linux. Example: +- ID=fedora or +- ID=debian. ++ ID=blag or ++ ID=gnewsense. + + + +@@ -168,9 +168,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 +- ID=centos, an assignment of ++ ID=blag, an assignment of + ID_LIKE="rhel fedora" would be appropriate. +- For an operating system with ID=ubuntu, an ++ For an operating system with ID=gnewsense, an + assignment of ID_LIKE=debian is + appropriate. + +@@ -183,8 +183,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 +- field is optional. Example: VERSION_ID=17 +- or VERSION_ID=11.04. ++ field is optional. Example: VERSION_ID=210k ++ or VERSION_ID=7.0. + + + +@@ -195,8 +195,8 @@ + a release code name or OS version of some kind, as suitable. + If not set, defaults to + PRETTY_NAME="GNU/Linux". Example: +- PRETTY_NAME="Fedora 17 (Beefy +- Miracle)". ++ PRETTY_NAME="BLAG 210k ++ (Spartakus)". + + + +@@ -219,7 +219,7 @@ + Common + Platform Enumeration Specification as proposed by the + NIST. This field is optional. Example: +- CPE_NAME="cpe:/o:fedoraproject:fedora:17" ++ CPE_NAME="cpe:/o:blagblagblag:blag:210k" + + + +@@ -254,8 +254,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: +- HOME_URL="https://fedoraproject.org/" and +- BUG_REPORT_URL="https://bugzilla.redhat.com/" ++ HOME_URL="https://www.blagblagblag.org/" and ++ BUG_REPORT_URL="https://blag.fsf.org/" + + + +@@ -330,21 +330,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: +- DEBIAN_BTS="debbugs://bugs.debian.org/" ++ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" + + + + Example + +- NAME=Fedora +-VERSION="17 (Beefy Miracle)" +-ID=fedora +-VERSION_ID=17 +-PRETTY_NAME="Fedora 17 (Beefy Miracle)" +-ANSI_COLOR="0;34" +-CPE_NAME="cpe:/o:fedoraproject:fedora:17" +-HOME_URL="https://fedoraproject.org/" +-BUG_REPORT_URL="https://bugzilla.redhat.com/" ++ NAME=Parabola ++VERSION="rolling-release" ++ID=parabola ++ID_LIKE=arch ++VERSION_ID=rolling-release ++PRETTY_NAME="Parabola GNU/Linux-libre" ++ANSI_COLOR="1;35" ++CPE_NAME="cpe:/o:parabola:parabola:rolling-release" ++HOME_URL="https://www.parabola.nu/" ++BUG_REPORT_URL="https://labs.parabola.nu/" + + + +diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml +index 86cdb4e..bd7392c 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -912,46 +912,35 @@ + Examples + + +- Download a Fedora image and start a shell in it ++ Build and boot a minimal BLAG distribution in a container + +- # machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz +-# systemd-nspawn -M Fedora-Cloud-Base-20141203-21 +- +- This downloads an image using +- machinectl1 +- and opens a shell in it. +- +- +- +- Build and boot a minimal Fedora distribution in a container +- +- # dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal ++ # dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal + # systemd-nspawn -bD /srv/mycontainer + +- This installs a minimal Fedora distribution into the ++ This installs a minimal BLAG distribution into the + directory /srv/mycontainer/ + and then boots an OS in a namespace container in it. + + + +- Spawn a shell in a container of a minimal Debian unstable distribution ++ Spawn a shell in a container of a minimal gNewSense unstable distribution + +- # debootstrap --arch=amd64 unstable ~/debian-tree/ +-# systemd-nspawn -D ~/debian-tree/ ++ # debootstrap --arch=amd64 unstable ~/gnewsense-tree/ ++# systemd-nspawn -D ~/gnewsense-tree/ + +- This installs a minimal Debian unstable distribution into +- the directory ~/debian-tree/ and then ++ This installs a minimal gNewSense unstable distribution into ++ the directory ~/gnewsense-tree/ and then + spawns a shell in a namespace container in it. + + + +- Boot a minimal Arch Linux distribution in a container ++ Boot a minimal Parabola GNU/Linux-libre distribution in a container + +- # pacstrap -c -d ~/arch-tree/ base +-# systemd-nspawn -bD ~/arch-tree/ ++ # pacstrap -c -d ~/parabola-tree/ base ++# systemd-nspawn -bD ~/parabola-tree/ + +- This installs a minimal Arch Linux distribution into the +- directory ~/arch-tree/ and then boots an OS ++ This installs a minimal Parabola GNU/Linux-libre distribution into the ++ directory ~/parabola-tree/ and then boots an OS + in a namespace container in it. + + +-- +2.8.3 + diff --git a/pcr/systemd-knock/PKGBUILD b/pcr/systemd-knock/PKGBUILD index 02d675c41..8327810a4 100644 --- a/pcr/systemd-knock/PKGBUILD +++ b/pcr/systemd-knock/PKGBUILD @@ -2,32 +2,42 @@ # Maintainer (Arch): Tom Gundersen # Maintainer: Márcio Silva # Maintainer: André Silva +# Contributor: Luke Shumaker _pkgbase=systemd pkgbase=systemd-knock -pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat') -pkgver=229 -pkgrel=3 +pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat' + 'libsystemd-knock-standalone' 'libudev-knock' 'nss-knock-myhostname' 'nss-knock-mymachines' 'nss-knock-resolve') +pkgver=230 +pkgrel=4 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-libre-api-headers' 'python-lxml' 'quota-tools' 'shadow' 'git') -[ "$CARCH" != "armv7h" ] && makedepends+=('gnu-efi-libs') +makedepends_i686=('gnu-efi-libs') +makedepends_x86_64=('gnu-efi-libs') options=('strip' 'debug') source=("git://github.com/systemd/systemd.git#tag=v$pkgver" #'0001-adds-TCP-Stealth-support-to-systemd.patch::https://gnunet.org/sites/default/files/systemd-knock-patch.diff' - "https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-221.patch"{,.sig} + "https://repo.parabola.nu/other/knock/patches/systemd/0001-adds-TCP-Stealth-support-to-systemd-230.patch"{,.sig} "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig} 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' 'parabola.conf' 'loader.conf' - 'gnu+linux.patch') + 'udev-hwdb.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' + '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' + '0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch' + '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' + "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig}) md5sums=('SKIP' - '936208db8995db77efbb388735f950af' + '32e8e7c8802dac3078a2c4b0e05abd30' 'SKIP' 'f8253cd3c0f249591338fbb4c223d249' 'SKIP' @@ -36,38 +46,50 @@ md5sums=('SKIP' '1b3aa3a0551b08af9305d33f85b5c2fc' '36ee74767ac8734dede1cbd0f4f275d7' '9b9f4a58e4c4009bf5290c5b297600c3' - 'd37895215ef74e172c594aebe1ba23cb') + 'a475a5ed8f03fb0f6b58b4684998d05c' + '92a4bb5e527e1e956743c1ffa622adc7' + '397e2262bf96df3bc1762a3b0bef2f75' + 'e592f6778c12627d46982ddfe0698361' + 'c4c559f9916806f5162ccff3e7c433e8' + '5166fe700ef5991c2da3876206c699fb' + '166ce41b60d4eaa7738486f7aab5ebd8' + 'f8253cd3c0f249591338fbb4c223d249' + 'SKIP') validpgpkeys=( '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva ) -prepare() { - cd "$_pkgbase" +_backports=( + # Revert "rules: allow users to access frame buffer devices" (#3333) + e77813ca9f4e0735fd0e3e2caae4d7d1ee436011 - # networkd: FIONREAD is not reliable on some sockets - git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf + # {machine,system}ctl: always pass &changes and &n_changes (#3350) + acc0269cad31d1aaef2034a055b34c07c88a353d - # fix assertion failure in src/core/timer.c on bootup (FS#48197) - git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91 + # systemctl: fix return values on success + 5f056378b0ceffb6e6fba3513f7eae72e2d09dc8 - # fix udevd error checking from cg_unified() (FS#48188) - git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb + # automount: handle expire_tokens when the mount unit changes its state (#3434) + 0a62f81045dd810c8f1223cccbac4d706ea2cb45 +) - # revert "core: resolve specifier in config_parse_exec()" - git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163 +prepare() { + cd "$_pkgbase" - # Rename "Linux" -> "GNU/Linux" - patch -Np1 -i "$srcdir/gnu+linux.patch" - sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c - sed -i '\|pretty_name| s|Linux|GNU/Linux|' src/analyze/analyze.c src/core/main.c src/firstboot/firstboot.c - sed -i '\|PRETTY_NAME| s|Linux|GNU/Linux|' src/kernel-install/90-loaderentry.install + if (( ${#_backports[*]} > 0 )); then + git cherry-pick -n "${_backports[@]}" + fi + + # apply FSDG and Knock patches + local patchfile + for patchfile in "$srcdir"/*.patch; do + patch -Np1 -i "$patchfile" + done # Rename "Linux Boot Manager" -> "Systemd Boot Manager" sed -i 's|Linux Boot Manager|Systemd Boot Manager|' src/boot/bootctl.c - patch -Np1 <../0001-adds-TCP-Stealth-support-to-systemd-221.patch - ./autogen.sh } @@ -80,24 +102,66 @@ build() { LDFLAGS+=" -Wl,-fuse-ld=bfd" CFLAGS+=" -fno-lto" CXXFLAGS+=" -fno-lto" - else - extra=--enable-gnuefi fi - ./configure \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --enable-lz4 \ - --enable-tcp-stealth \ - --disable-audit \ - --disable-ima \ - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ - --with-ntp-servers="${timeservers[*]}" \ - $extra + local enable_gnuefi='' + if [ "$CARCH" != "armv7h" ]; then + enable_gnuefi='--enable-gnuefi' + fi + + local configure_options=( + --libexecdir=/usr/lib + --localstatedir=/var + --sysconfdir=/etc + + --enable-lz4 + $enable_gnuefi + --disable-audit + --disable-ima + --enable-tcp-stealth + + --with-sysvinit-path= + --with-sysvrcnd-path= + --with-ntp-servers="${timeservers[*]}" + --with-default-dnssec=no + --without-kill-user-processes + ) + + ./configure "${configure_options[@]}" make + + # 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" + + # Put things in the main systemd package by default + make DESTDIR="$srcdir/dest/systemd" install + + 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/ + + 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/ + + local nssmodule + for nssmodule in myhostname mymachines resolve; do + install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} + mv -T "$srcdir/dest"/{systemd,nss-$nssmodule}/usr/share/man/man8/nss-$nssmodule.8 + mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/ + 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 \ + -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 + + rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include} } package_systemd-knock() { @@ -106,9 +170,9 @@ package_systemd-knock() { depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'libsystemd-knock' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') - provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver") - replaces=('nss-myhostname' 'systemd-tools' 'udev') - conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd') + provides=("systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver") + replaces=('systemd-tools' 'udev') + conflicts=('systemd-tools' 'udev' 'systemd') optdepends=('cryptsetup: required for encrypted block devices' 'libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' @@ -123,7 +187,6 @@ package_systemd-knock() { etc/dbus-1/system.d/org.freedesktop.import1.conf etc/dbus-1/system.d/org.freedesktop.network1.conf etc/pam.d/systemd-user - etc/systemd/bootchart.conf etc/systemd/coredump.conf etc/systemd/journald.conf etc/systemd/journal-remote.conf @@ -136,7 +199,7 @@ package_systemd-knock() { etc/udev/udev.conf) install="systemd.install" - make -C "$_pkgbase" DESTDIR="$pkgdir" install + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" # don't write units to /etc by default. some of these will be re-enabled on # post_install. @@ -174,26 +237,70 @@ package_systemd-knock() { # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - ### manpages shipped with systemd-sysvcompat - rm "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - - ### runtime libraries shipped with libsystemd - rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* - # 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 -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" } package_libsystemd-knock() { - pkgdesc="systemd client libraries with support for stealth TCP sockets" - depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') + pkgdesc="systemd client libraries metapackage" + depends=(libsystemd-knock-standalone libudev-knock nss-knock-myhostname nss-knock-mymachines nss-knock-resolve) license=('GPL2') - provides=('libsystemd.so' 'libudev.so' "libsystemd=$pkgver") + provides=("libsystemd=$pkgver") conflicts=('libsystemd') +} + +package_libsystemd-knock-standalone() { + pkgdesc="systemd client library" + depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') + license=('GPL2') + provides=('libsystemd.so' "libsystemd-standalone=$pkgver") + conflicts=('libsystemd-standalone') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/libsystemd" "$pkgdir" +} + +package_libudev-knock() { + pkgdesc="systemd library for enumerating and introspecting local devices" + depends=('glibc' 'libcap') + license=('GPL2') + provides=('libudev.so' "libudev=$pkgver") + conflicts=('libudev-knock') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" +} + +package_nss-knock-myhostname() { + pkgdesc="NSS module providing hostname resolution for the locally configured system hostname" + depends=('glibc' 'libcap') + license=('GPL2') + provides=("nss-myhostname=$pkgver") + conflicts=('nss-myhostname') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" +} + +package_nss-knock-mymachines() { + pkgdesc="NSS module providing hostname resolution for local systemd-machined container instances" + depends=('glibc' 'libcap') + license=('GPL2') + provides=("nss-mymachines=$pkgver") + conflicts=('nss-mymachines') + + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" +} + +package_nss-knock-resolve() { + pkgdesc="NSS module providing hostname resolution via systemd-resolved" + depends=('glibc' 'libcap') + license=('GPL2') + provides=("nss-resolve=$pkgver") + conflicts=('nss-resolve') - make -C "$_pkgbase" DESTDIR="$pkgdir" install-libLTLIBRARIES + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" } package_systemd-knock-sysvcompat() { @@ -203,10 +310,7 @@ package_systemd-knock-sysvcompat() { conflicts=('sysvinit' 'systemd-sysvcompat') depends=('systemd-knock') - install -dm755 "$pkgdir"/usr/share/man/man8 - cp -d --no-preserve=ownership,timestamp \ - "$_pkgbase"/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$pkgdir"/usr/share/man/man8 + cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir" install -dm755 "$pkgdir/usr/bin" for tool in runlevel reboot shutdown poweroff halt telinit; do diff --git a/pcr/systemd-knock/gnu+linux.patch b/pcr/systemd-knock/gnu+linux.patch deleted file mode 100644 index f6a5e81d5..000000000 --- a/pcr/systemd-knock/gnu+linux.patch +++ /dev/null @@ -1,493 +0,0 @@ -diff -Nur a/man/bootup.xml b/man/bootup.xml ---- a/man/bootup.xml 2015-09-11 14:55:47.363340869 -0300 -+++ b/man/bootup.xml 2015-09-11 14:57:22.649010069 -0300 -@@ -54,7 +54,7 @@ - boot. Immediately after power-up, the system BIOS will do minimal - hardware initialization, and hand control over to a boot loader - stored on a persistent storage device. This boot loader will then -- invoke an OS kernel from disk (or the network). In the Linux case, -+ invoke an OS kernel from disk (or the network). In the GNU/Linux case, - this kernel (optionally) extracts and executes an initial RAM disk - image (initrd), such as generated by - dracut8, -diff -Nur a/man/custom-html.xsl b/man/custom-html.xsl ---- a/man/custom-html.xsl 2015-11-28 05:22:36.372154698 -0300 -+++ b/man/custom-html.xsl 2015-11-28 05:23:08.917203964 -0300 -@@ -83,10 +83,10 @@ - - - -- -+ - - -- https://www.archlinux.org/ -+ https://www.parabola.nu/ - - / - -@@ -96,19 +96,6 @@ - - - -- -- -- -- -- -- https://www.freebsd.org/cgi/man.cgi? -- -- ( -- -- ) -- -- -- - - - -diff -Nur a/man/daemon.xml b/man/daemon.xml ---- a/man/daemon.xml 2015-11-28 05:22:36.372154698 -0300 -+++ b/man/daemon.xml 2015-11-28 05:26:43.416694259 -0300 -@@ -74,7 +74,7 @@ - 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 - /proc/self/fd, with a fallback of - iterating from file descriptor 3 to the value returned by -@@ -168,7 +168,7 @@ - - New-Style Daemons - -- Modern services for Linux should be implemented as -+ 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. - -@@ -311,7 +311,7 @@ - as detailed in the LSB - Linux Standard Base Core Specification. 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 -@@ -479,7 +479,7 @@ - start daemons or .socket 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 -+ an alternative to implement this is by utilizing the GNU/Linux - IP_FREEBIND socket option, as accessible - via FreeBind=yes in systemd socket files (see - systemd.socket5 -@@ -491,7 +491,7 @@ - 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. Instead of scheduling jobs from userspace based on -+ of GNU/Linux. 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 -diff -Nur a/man/kernel-install.xml b/man/kernel-install.xml ---- a/man/kernel-install.xml 2015-09-11 14:55:47.366340890 -0300 -+++ b/man/kernel-install.xml 2015-09-11 15:04:24.500215627 -0300 -@@ -106,7 +106,7 @@ - PRETTY_NAME parameter specified - in /etc/os-release or - /usr/lib/os-release (if the former is -- missing), or "Linux -+ missing), or "GNU/Linux - KERNEL-VERSION", if unset. If - the file initrd is found next to the - linux file, the initrd will be added to -diff -Nur a/man/os-release.xml b/man/os-release.xml ---- a/man/os-release.xml 2015-09-20 20:12:13.796706013 -0300 -+++ b/man/os-release.xml 2015-09-20 20:14:32.399758269 -0300 -@@ -121,8 +121,8 @@ - A string identifying the operating system, - without a version component, and suitable for presentation to - the user. If not set, defaults to -- NAME=Linux. Example: -- NAME=Fedora or NAME="Debian -+ NAME=GNU/Linux. Example: -+ NAME=BLAG or NAME="gNewSense - GNU/Linux". - - -@@ -133,8 +133,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: -- VERSION=17 or VERSION="17 (Beefy -- Miracle)". -+ VERSION=210k or VERSION="210k" -+ . - - - -@@ -145,9 +145,9 @@ - the operating system, excluding any version information and - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to -- ID=linux. Example: -- ID=fedora or -- ID=debian. -+ ID=gnu-plus-linux. Example: -+ ID=blag or -+ ID=gnewsense. - - - -@@ -168,9 +168,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 -- ID=centos, an assignment of -+ ID=blag, an assignment of - ID_LIKE="rhel fedora" would be appropriate. -- For an operating system with ID=ubuntu, an -+ For an operating system with ID=gnewsense, an - assignment of ID_LIKE=debian is - appropriate. - -@@ -183,8 +183,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 -- field is optional. Example: VERSION_ID=17 -- or VERSION_ID=11.04. -+ field is optional. Example: VERSION_ID=210k -+ or VERSION_ID=7.0. - - - -@@ -194,9 +194,8 @@ - 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 -- PRETTY_NAME="Linux". Example: -- PRETTY_NAME="Fedora 17 (Beefy -- Miracle)". -+ PRETTY_NAME="GNU/Linux". Example: -+ PRETTY_NAME="BLAG 210k". - - - -@@ -219,7 +218,7 @@ - Common - Platform Enumeration Specification as proposed by the - NIST. This field is optional. Example: -- CPE_NAME="cpe:/o:fedoraproject:fedora:17" -+ CPE_NAME="cpe:/o:blagblagblag:blag:210k" - - - -@@ -254,8 +253,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: -- HOME_URL="https://fedoraproject.org/" and -- BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ HOME_URL="https://www.blagblagblag.org/" and -+ BUG_REPORT_URL="https://blag.fsf.org/" - - - -@@ -330,21 +329,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: -- DEBIAN_BTS="debbugs://bugs.debian.org/" -+ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" - - - - Example - -- NAME=Fedora --VERSION="17 (Beefy Miracle)" --ID=fedora --VERSION_ID=17 --PRETTY_NAME="Fedora 17 (Beefy Miracle)" --ANSI_COLOR="0;34" --CPE_NAME="cpe:/o:fedoraproject:fedora:17" --HOME_URL="https://fedoraproject.org/" --BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ NAME=Parabola -+VERSION="rolling-release" -+ID=parabola -+ID_LIKE=arch -+VERSION_ID=rolling-release -+PRETTY_NAME="Parabola GNU/Linux-libre" -+ANSI_COLOR="1;35" -+CPE_NAME="cpe:/o:parabola:parabola:rolling-release" -+HOME_URL="https://www.parabola.nu/" -+BUG_REPORT_URL="https://labs.parabola.nu/" - - - -diff -Nur a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml ---- a/man/sd-bus-errors.xml 2015-11-28 05:22:36.375487866 -0300 -+++ b/man/sd-bus-errors.xml 2015-11-28 05:23:08.920537132 -0300 -@@ -126,7 +126,7 @@ - - In addition to this list, in sd-bus, the special error - namespace System.Error. is used to map -- arbitrary Linux system errors (as defined by errno3) - to D-Bus errors and back. For example, the error - EUCLEAN is mapped to -diff -Nur a/man/sd-login.xml b/man/sd-login.xml ---- a/man/sd-login.xml 2015-09-11 14:55:47.368340904 -0300 -+++ b/man/sd-login.xml 2015-09-11 15:33:41.770605951 -0300 -@@ -68,8 +68,8 @@ - - See Multi-Seat -- on Linux for an introduction into multi-seat support on -- Linux, the background for this set of APIs. -+ on GNU/Linux for an introduction into multi-seat support on -+ GNU/Linux, the background for this set of APIs. - - Note that these APIs only allow purely passive access and - monitoring of seats, sessions and users. To actively make changes -diff -Nur a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml ---- a/man/sd_bus_error_add_map.xml 2015-09-11 14:55:47.369340911 -0300 -+++ b/man/sd_bus_error_add_map.xml 2015-09-11 15:31:21.081524317 -0300 -@@ -82,7 +82,7 @@ - - The sd_bus_error_add_map() call may be - used to register additional mappings for converting D-Bus errors -- to Linux errno-style errors. The mappings -+ to GNU/Linux errno-style errors. The mappings - defined with this call are consulted by calls such as - sd_bus_error_set3 - or -diff -Nur a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml ---- a/man/sd_is_fifo.xml 2015-09-11 14:55:47.372340932 -0300 -+++ b/man/sd_is_fifo.xml 2015-09-11 15:32:47.346188708 -0300 -@@ -145,7 +145,7 @@ - the path parameter is - NULL. For normal file system - AF_UNIX sockets, set the -- length parameter to 0. For Linux abstract -+ length parameter to 0. For GNU/Linux abstract - namespace sockets, set the length to the - size of the address, including the initial 0 byte, and set the - path to the initial 0 byte of the socket -diff -Nur a/man/sd_notify.xml b/man/sd_notify.xml ---- a/man/sd_notify.xml 2015-10-17 07:04:47.746947733 -0300 -+++ b/man/sd_notify.xml 2015-10-17 07:05:10.849133263 -0300 -@@ -316,7 +316,7 @@ - referenced in the $NOTIFY_SOCKET environment - variable. If the first character of - $NOTIFY_SOCKET is @, the -- string is understood as Linux abstract namespace socket. The -+ string is understood as GNU/Linux abstract namespace socket. The - datagram is accompanied by the process credentials of the sending - service, using SCM_CREDENTIALS. - -diff -Nur a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml ---- a/man/systemd-detect-virt.xml 2015-11-28 05:22:36.382154201 -0300 -+++ b/man/systemd-detect-virt.xml 2015-11-28 05:29:15.395921466 -0300 -@@ -104,16 +104,6 @@ - - - -- vmware -- VMware Workstation or Server, and related products -- -- -- -- microsoft -- Hyper-V, also known as Viridian or Windows Server Virtualization -- -- -- - oracle - Oracle VM VirtualBox (historically marketed by innotek and Sun Microsystems) - -@@ -146,12 +136,12 @@ - - - lxc -- Linux container implementation by LXC -+ GNU/Linux container implementation by LXC - - - - lxc-libvirt -- Linux container implementation by libvirt -+ GNU/Linux container implementation by libvirt - - - -diff -Nur a/man/systemd-logind.service.xml b/man/systemd-logind.service.xml ---- a/man/systemd-logind.service.xml 2015-09-11 14:55:47.378340974 -0300 -+++ b/man/systemd-logind.service.xml 2015-09-11 15:45:37.799989107 -0300 -@@ -94,7 +94,7 @@ - - See Multi-Seat -- on Linux for an introduction into basic concepts of logind -+ on GNU/Linux for an introduction into basic concepts of logind - such as users, sessions and seats. - - See the - -- Similarly, if run inside a Linux container -+ Similarly, if run inside a GNU/Linux 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 In contrast to - chroot1 systemd-nspawn -- may be used to boot full Linux-based operating systems in a -+ may be used to boot full GNU/Linux-based operating systems in a - container. - - Use a tool like - dnf8, - debootstrap8, - or -- pacman8 -+ pacman8 - to set up an OS directory tree suitable as file system hierarchy - for systemd-nspawn containers. - -@@ -852,46 +852,35 @@ - Examples - - -- Download a Fedora image and start a shell in it -+ Build and boot a minimal BLAG distribution in a container - -- # machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/21/Cloud/Images/x86_64/Fedora-Cloud-Base-20141203-21.x86_64.raw.xz --# systemd-nspawn -M Fedora-Cloud-Base-20141203-21 -- -- This downloads an image using -- machinectl1 -- and opens a shell in it. -- -- -- -- Build and boot a minimal Fedora distribution in a container -- -- # dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal -+ # dnf -y --releasever=210k --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=blag --enablerepo=updates install systemd passwd dnf blag-release vim-minimal - # systemd-nspawn -bD /srv/mycontainer - -- This installs a minimal Fedora distribution into the -+ This installs a minimal BLAG distribution into the - directory /srv/mycontainer/ - and then boots an OS in a namespace container in it. - - - -- Spawn a shell in a container of a minimal Debian unstable distribution -+ Spawn a shell in a container of a minimal gNewSense unstable distribution - -- # debootstrap --arch=amd64 unstable ~/debian-tree/ --# systemd-nspawn -D ~/debian-tree/ -+ # debootstrap --arch=amd64 unstable ~/gnewsense-tree/ -+# systemd-nspawn -D ~/gnewsense-tree/ - -- This installs a minimal Debian unstable distribution into -- the directory ~/debian-tree/ and then -+ This installs a minimal gNewSense unstable distribution into -+ the directory ~/gnewsense-tree/ and then - spawns a shell in a namespace container in it. - - - -- Boot a minimal Arch Linux distribution in a container -+ Boot a minimal Parabola GNU/Linux-libre distribution in a container - -- # pacstrap -c -d ~/arch-tree/ base --# systemd-nspawn -bD ~/arch-tree/ -+ # pacstrap -c -d ~/parabola-tree/ base -+# systemd-nspawn -bD ~/parabola-tree/ - -- This installs a minimal Arch Linux distribution into the -- directory ~/arch-tree/ and then boots an OS -+ This installs a minimal Parabola GNU/Linux-libre distribution into the -+ directory ~/parabola-tree/ and then boots an OS - in a namespace container in it. - - -@@ -929,7 +918,7 @@ - chroot1, - dnf8, - debootstrap8, -- pacman8, -+ pacman8, - systemd.slice5, - machinectl1, - btrfs8 -diff -Nur a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml ---- a/man/systemd-sleep.conf.xml 2015-09-11 14:55:47.380340988 -0300 -+++ b/man/systemd-sleep.conf.xml 2015-09-11 16:08:59.858313702 -0300 -@@ -165,7 +165,7 @@ - Example: freeze - - Example: to exploit the freeze mode added -- in Linux 3.9, one can use systemctl suspend -+ in Linux 3.9 kernel, one can use systemctl suspend - with - [Sleep] - SuspendState=freeze -diff -Nur a/man/systemd.socket.xml b/man/systemd.socket.xml ---- a/man/systemd.socket.xml 2015-11-28 05:22:36.392153706 -0300 -+++ b/man/systemd.socket.xml 2015-11-28 05:23:08.920537132 -0300 -@@ -289,7 +289,7 @@ - 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 -- ListenFIFO= directive above. On Linux -+ ListenFIFO= directive above. On GNU/Linux - message queue descriptors are actually file descriptors and - can be inherited between processes. - -diff -Nur a/man/systemd.xml b/man/systemd.xml ---- a/man/systemd.xml 2015-11-28 05:22:36.392153706 -0300 -+++ b/man/systemd.xml 2015-11-28 05:23:08.923870299 -0300 -@@ -61,7 +61,7 @@ - - Description - -- systemd is a system and service manager for Linux operating -+ 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. -@@ -852,10 +852,10 @@ - Kernel Command Line - - When run as system instance systemd parses a number of -- kernel command line argumentsIf run inside a Linux -+ kernel command line argumentsIf run inside a GNU/Linux - 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 GNU/Linux containers, - these arguments are parsed from /proc/cmdline - instead.: - diff --git a/pcr/systemd-knock/udev-hwdb.hook b/pcr/systemd-knock/udev-hwdb.hook new file mode 100644 index 000000000..7bc055b4e --- /dev/null +++ b/pcr/systemd-knock/udev-hwdb.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/hwdb.d/* + +[Action] +Description = Updating udev Hardware Database... +When = PostTransaction +Exec = /usr/bin/udevadm hwdb --update -- cgit v1.2.3-54-g00ecf