From 631fef79feb0063d1e8000cc17746f1725084a91 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 21 Feb 2021 21:54:20 -0500 Subject: [arm/libre-testing/systemd]: v247.3 --- ...an-Use-FSDG-operating-systems-as-examples.patch | 121 ++++++++++++++------- 1 file changed, 81 insertions(+), 40 deletions(-) (limited to 'libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch') diff --git a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 0905e6bad..d14058763 100644 --- a/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre-testing/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -97,26 +97,29 @@ index 272258b4e1..6cea40cb99 100644 -@@ -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: -- DEBIAN_BTS="debbugs://bugs.debian.org/" -+ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" - - +@@ -350,25 +350,19 @@ Example - NAME=Fedora --VERSION="17 (Beefy Miracle)" +-VERSION="32 (Workstation Edition)" -ID=fedora --VERSION_ID=17 --PRETTY_NAME="Fedora 17 (Beefy Miracle)" --ANSI_COLOR="0;34" --CPE_NAME="cpe:/o:fedoraproject:fedora:17" +-VERSION_ID=32 +-PRETTY_NAME="Fedora 32 (Workstation Edition)" +-ANSI_COLOR="0;38;2;60;110;180" +-LOGO=fedora-logo-icon +-CPE_NAME="cpe:/o:fedoraproject:fedora:32" -HOME_URL="https://fedoraproject.org/" --BUG_REPORT_URL="https://bugzilla.redhat.com/" +-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f32/system-administrators-guide/" +-SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" +-BUG_REPORT_URL="https://bugzilla.redhat.com/" +-REDHAT_BUGZILLA_PRODUCT="Fedora" +-REDHAT_BUGZILLA_PRODUCT_VERSION=32 +-REDHAT_SUPPORT_PRODUCT="Fedora" +-REDHAT_SUPPORT_PRODUCT_VERSION=32 +-PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" +-VARIANT="Workstation Edition" +-VARIANT_ID=workstation + NAME=Parabola +VERSION="rolling-release" +ID=parabola @@ -124,26 +127,20 @@ index 272258b4e1..6cea40cb99 100644 +VERSION_ID=rolling-release +PRETTY_NAME="Parabola GNU/Linux-libre" +ANSI_COLOR="1;35" ++LOGO=parabola-logo-icon +CPE_NAME="cpe:/o:parabola:parabola:rolling-release" +HOME_URL="https://www.parabola.nu/" ++DOCUMENTATION_URL="https://wiki.parabola.nu/" ++SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards" +BUG_REPORT_URL="https://labs.parabola.nu/" diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 284c9b294b..7b3d211161 100644 +index 588924ee61..34ff6a7e96 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1,7 +1,7 @@ - - -+ - - ]> - -@@ -1176,11 +1176,12 @@ +@@ -1461,11 +1461,12 @@ Examples @@ -154,10 +151,10 @@ index 284c9b294b..7b3d211161 100644 - # machinectl pull-raw --verify=no \ + # machinectl pull-raw -&2D;verify=no \ - https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz - # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw - -@@ -1188,31 +1189,32 @@ + https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \ + Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 + # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64 +@@ -1474,37 +1475,36 @@ machinectl1 and opens a shell in it. @@ -169,18 +166,18 @@ index 284c9b294b..7b3d211161 100644 - # 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 +- systemd passwd dnf fedora-release vim-minimal glibc-minimal-langpack -# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version; + # 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 passwd dnf blag-release vim-minimal glibc-minimal-langpack +# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version; - This installs a minimal Fedora distribution into the -- directory /var/lib/machines/f&fedora_latest_version; +- directory /var/lib/machines/f&fedora_latest_version; + This installs a minimal BLAG distribution into the -+ directory /var/lib/machines/blag&blag_latest_version; - and then boots an OS in a namespace container in it. Because the installation ++ directory /var/lib/machines/blag&blag_latest_version; + and then boots that OS in a namespace container. Because the installation is located underneath the standard /var/lib/machines/ directory, it is also possible to start the machine using - systemd-nspawn -M f&fedora_latest_version;. @@ -198,26 +195,33 @@ index 284c9b294b..7b3d211161 100644 - This installs a minimal Debian unstable distribution into - the directory ~/debian-tree/ and then -+ This installs a minimal gNewSense unstable distribution into ++ This installs a minimal gNewSense Ucclia distribution into + the directory ~/gnewsense-tree/ and then - spawns a shell in a namespace container in it. + spawns a shell from this image in a namespace container. debootstrap supports -@@ -1227,29 +1229,31 @@ +- Debian, +- Ubuntu, +- and Tanglu ++ gNewSense + out of the box, so the same command can be used to install any of those. For other + distributions from the Debian family, a mirror has to be specified, see + debootstrap8. +@@ -1513,29 +1513,31 @@ Boot a minimal - <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container + Parabola GNU/Linux-libre distribution in a container -- # pacstrap -c -d ~/arch-tree/ base +- # pacstrap -c ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/ -+ # pacstrap -c -d ~/parabola-tree/ base ++ # pacstrap -c ~/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 distribution into the ++ 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. @@ -243,6 +247,43 @@ index 284c9b294b..7b3d211161 100644 Boot into an ephemeral snapshot of the host system +diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in +index 9963322fc9..4b71a4ab8f 100644 +--- a/man/custom-entities.ent.in ++++ b/man/custom-entities.ent.in +@@ -11,5 +11,4 @@ + + + +- +- ++ +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 9026849559..7b3b130763 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -940,11 +940,12 @@ + to open a shell in it. + + ++ + + + Exports a container image as tar file -- 2.18.0 -- cgit v1.2.3