From 3d271810cb33579af657475407a5c3157375cb80 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 12:49:37 -0400 Subject: libre/systemd: Split gnu+linux.patch into multiple patches, tidy them up. I removed several instances of replacing "Linux" with "GNU/Linux" in man pages where it was (correctly) referring to kernel, not the complete operating system. In the FSDG-distros patch, I added " (Spartakus)" to several BLAG examples, as appropriate. Also, some of the linebreaks were in bad locations with the XML. I also added a patch to systemd-resolved to have the default hostname be "gnu-linux[.local]" instead of "linux[.local]". --- ...an-Use-FSDG-operating-systems-as-examples.patch | 199 +++++++++++++++++++++ 1 file changed, 199 insertions(+) create mode 100644 libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch (limited to 'libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch') diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch new file mode 100644 index 000000000..82d60ec94 --- /dev/null +++ b/libre/systemd/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 + -- cgit v1.2.3-54-g00ecf