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/" @@ -350,25 +350,19 @@ Example - NAME=Fedora -VERSION="32 (Workstation Edition)" -ID=fedora -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/" -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 +ID_LIKE=arch +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 588924ee61..34ff6a7e96 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1461,11 +1461,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 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 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; + This installs a minimal BLAG distribution into the + 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;. + 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 Ucclia distribution into + the directory ~/gnewsense-tree/ and then spawns a shell from this image in a namespace container. debootstrap supports - 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 ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/ + # 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 GNU/Linux-libre 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 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