From f5deb41aaa263d7dbf2e5dbe631b64362c1a594a Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 3 Jan 2020 11:55:41 -0500 Subject: [notsystemd][notsystemd-common][notsystemd-udev]: move to [nonsystemd] --- ...an-Use-FSDG-operating-systems-as-examples.patch | 248 +++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch (limited to 'nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch') diff --git a/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch new file mode 100644 index 000000000..0905e6bad --- /dev/null +++ b/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -0,0 +1,248 @@ +From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +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 | 50 +++++++++++++++++++++++------------------- + 2 files changed, 52 insertions(+), 47 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 272258b4e1..6cea40cb99 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -99,7 +99,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". + + +@@ -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: +- VERSION=17 or VERSION="17 (Beefy +- Miracle)". ++ VERSION=210k or VERSION="210k ++ (Spartakus)". + + + +@@ -123,8 +123,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. + + + +@@ -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 +- 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. + +@@ -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 +- field is optional. Example: VERSION_ID=17 +- or VERSION_ID=11.04. ++ field is optional. Example: VERSION_ID=210k ++ or VERSION_ID=7.0. + + + +@@ -188,8 +188,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)". + + + +@@ -212,7 +212,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" + + + +@@ -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: +- 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/" + + + +@@ -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/" + + + + 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 284c9b294b..7b3d211161 100644 +--- a/man/systemd-nspawn.xml ++++ b/man/systemd-nspawn.xml +@@ -1,7 +1,7 @@ + + ++ + + ]> + +@@ -1176,11 +1176,12 @@ + + Examples + ++ + + +- Build and boot a minimal Fedora distribution in a container ++ Build and boot a minimal BLAG distribution in a container + +- # 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-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-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; ++ 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 + 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;. ++ systemd-nspawn -M blag&blag_latest_version;. + + + +- Spawn a shell in a container of a minimal Debian unstable distribution ++ Spawn a shell in a container of a minimal gNewSense Ucclia distribution + +- # debootstrap unstable ~/debian-tree/ +-# systemd-nspawn -D ~/debian-tree/ ++ # debootstrap ucclia ~/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. + + debootstrap supports +@@ -1227,29 +1229,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 +-# 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 distribution into the ++ directory ~/parabola-tree/ and then boots an OS + in a namespace container in it. + + ++ + + + Boot into an ephemeral snapshot of the host system +-- +2.18.0 + -- cgit v1.2.3