From 8fc54316515c83eba4f53988362db1fca62ac176 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 5 Aug 2021 11:16:52 +0200 Subject: [PATCH] fedora: say "Fedora Linux" This is the new official name, see https://fedoraproject.org/wiki/Changes/Fedora_Linux_in_os-release. --- man/mkosi.1 | 26 ++++++++++++++------------ mkosi.md | 34 +++++++++++++++++----------------- mkosi/__init__.py | 2 +- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/man/mkosi.1 b/man/mkosi.1 index 126bde6c1..530453bfc 100644 --- a/man/mkosi.1 +++ b/man/mkosi.1 @@ -193,9 +193,9 @@ If not specified, defaults to the distribution of the host. \f[B]\f[CB]--release=\f[B]\f[R], \f[B]\f[CB]-r\f[B]\f[R] The release of the distribution to install in the image. The precise syntax of the argument this takes depends on the -distribution used, and is either a numeric string (in case of Fedora, -CentOS, \&..., e.g.\ \f[C]29\f[R]), or a distribution version name (in -case of Debian, Ubuntu, \&..., e.g.\ \f[C]artful\f[R]). +distribution used, and is either a numeric string (in case of Fedora +Linux, CentOS, \&..., e.g.\ \f[C]29\f[R]), or a distribution version +name (in case of Debian, Ubuntu, \&..., e.g.\ \f[C]artful\f[R]). If neither this option, not \f[C]--distribution=\f[R] is specified, defaults to the distribution version of the host. If the distribution is specified, defaults to a recent version of it. @@ -508,8 +508,8 @@ With this option this may be turned off and all generated files are owned by \f[C]root\f[R]. .TP \f[B]\f[CB]--tar-strip-selinux-context\f[B]\f[R] -If running on a SELinux-enabled system (Fedora, CentOS), files inside -the container are tagged with SELinux context extended attributes +If running on a SELinux-enabled system (Fedora Linux, CentOS), files +inside the container are tagged with SELinux context extended attributes (\f[C]xattrs\f[R]), which may interfere with host SELinux rules in building or further container import stages. This option strips SELinux context attributes from the resulting tar @@ -1597,7 +1597,7 @@ enabling, and \f[C]0\f[R], \f[C]no\f[R], \f[C]false\f[R] for disabling. Images may be created containing installations of the following operating systems: .IP \[bu] 2 -\f[I]Fedora\f[R] +\f[I]Fedora Linux\f[R] .IP \[bu] 2 \f[I]Debian\f[R] .IP \[bu] 2 @@ -1623,7 +1623,8 @@ available. Specifically, any distribution that packages \f[C]debootstrap\f[R] may be used to build \f[I]Debian\f[R] or \f[I]Ubuntu\f[R] images. Any distribution that packages \f[C]dnf\f[R] may be used to build -\f[I]Fedora\f[R], \f[I]Mageia\f[R] or \f[I]OpenMandriva\f[R] images. +\f[I]Fedora Linux\f[R], \f[I]Mageia\f[R] or \f[I]OpenMandriva\f[R] +images. Any distro that packages \f[C]pacstrap\f[R] may be used to build \f[I]Arch Linux\f[R] images. Any distribution that packages \f[C]zypper\f[R] may be used to build @@ -1631,7 +1632,8 @@ Any distribution that packages \f[C]zypper\f[R] may be used to build Any distribution that packages \f[C]yum\f[R] (or the newer replacement \f[C]dnf\f[R]) may be used to build \f[I]CentOS\f[R] images. .PP -Currently, \f[I]Fedora\f[R] packages all relevant tools as of Fedora 28. +Currently, \f[I]Fedora Linux\f[R] packages all relevant tools as of +Fedora 28. .SS Compatibility .PP Legacy concepts are avoided: generated images use \f[I]GPT\f[R] disk @@ -2060,7 +2062,7 @@ Create and run a bootable btrfs \f[I]GPT\f[R] image, as \f[R] .fi .PP -Create and run a \f[I]Fedora\f[R] image into a plain directory: +Create and run a \f[I]Fedora Linux\f[R] image into a plain directory: .IP .nf \f[C] @@ -2112,7 +2114,7 @@ EOF \f[R] .fi .PP -To create a \f[I]Fedora\f[R] image with hostname: +To create a \f[I]Fedora Linux\f[R] image with hostname: .IP .nf \f[C] @@ -2134,7 +2136,7 @@ Hostname=image .SH REQUIREMENTS .PP mkosi is packaged for various distributions: Debian, Ubuntu, Arch Linux, -Fedora, OpenMandriva. +Fedora Linux, OpenMandriva. It is usually easiest to use the distribution package. .PP The current version requires systemd 233 (or actually, systemd-nspawn of @@ -2142,7 +2144,7 @@ it). .PP When not using distribution packages make sure to install the necessary dependencies. -For example, on \f[I]Fedora\f[R] you need: +For example, on \f[I]Fedora Linux\f[R] you need: .IP .nf \f[C] diff --git a/mkosi.md b/mkosi.md index 1749424be..7c19cc1a2 100644 --- a/mkosi.md +++ b/mkosi.md @@ -188,14 +188,14 @@ details see the table below. `--distribution=`, `-d` : The distribution to install in the image. Takes one of the following arguments: `fedora`, `debian`, `ubuntu`, `arch`, `opensuse`, - `mageia`, `centos`, `clear`, `photon`, `openmandriva`. If not specified, defaults to the - distribution of the host. + `mageia`, `centos`, `clear`, `photon`, `openmandriva`. If not + specified, defaults to the distribution of the host. `--release=`, `-r` : The release of the distribution to install in the image. The precise syntax of the argument this takes depends on the distribution used, - and is either a numeric string (in case of Fedora, CentOS, …, + and is either a numeric string (in case of Fedora Linux, CentOS, …, e.g. `29`), or a distribution version name (in case of Debian, Ubuntu, …, e.g. `artful`). If neither this option, not `--distribution=` is specified, defaults to the distribution version @@ -503,12 +503,11 @@ details see the table below. `--tar-strip-selinux-context` -: If running on a SELinux-enabled system (Fedora, CentOS), files inside - the container are tagged with SELinux context extended attributes - (`xattrs`), which may interfere with host SELinux rules in building - or further container import stages. - This option strips SELinux context attributes from the resulting - tar archive. +: If running on a SELinux-enabled system (Fedora Linux, CentOS), files + inside the container are tagged with SELinux context extended + attributes (`xattrs`), which may interfere with host SELinux rules + in building or further container import stages. This option strips + SELinux context attributes from the resulting tar archive. `--incremental`, `-i` @@ -1067,7 +1066,7 @@ they are modeled as boolean option that take either `1`, `yes`, Images may be created containing installations of the following operating systems: -* *Fedora* +* *Fedora Linux* * *Debian* @@ -1091,14 +1090,14 @@ In theory, any distribution may be used on the host for building images containing any other distribution, as long as the necessary tools are available. Specifically, any distribution that packages `debootstrap` may be used to build *Debian* or *Ubuntu* images. Any -distribution that packages `dnf` may be used to build *Fedora*, +distribution that packages `dnf` may be used to build *Fedora Linux*, *Mageia* or *OpenMandriva* images. Any distro that packages `pacstrap` may be used to build *Arch Linux* images. Any distribution that packages `zypper` may be used to build *openSUSE* images. Any distribution that packages `yum` (or the newer replacement `dnf`) may be used to build *CentOS* images. -Currently, *Fedora* packages all relevant tools as of Fedora 28. +Currently, *Fedora Linux* packages all relevant tools as of Fedora 28. ## Compatibility @@ -1468,7 +1467,7 @@ Create and run a bootable btrfs *GPT* image, as `foobar.raw`: # qemu-kvm -m 512 -smp 2 -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -drive format=raw,file=foobar.raw ``` -Create and run a *Fedora* image into a plain directory: +Create and run a *Fedora Linux* image into a plain directory: ```bash # mkosi -d fedora -t directory -o quux @@ -1514,7 +1513,7 @@ EOF # systemd-nspawn -bi image.raw ``` -To create a *Fedora* image with hostname: +To create a *Fedora Linux* image with hostname: ```bash # mkosi -d fedora --hostname image ``` @@ -1530,13 +1529,14 @@ Hostname=image # REQUIREMENTS -mkosi is packaged for various distributions: Debian, Ubuntu, Arch Linux, Fedora, OpenMandriva. -It is usually easiest to use the distribution package. +mkosi is packaged for various distributions: Debian, Ubuntu, Arch +Linux, Fedora Linux, OpenMandriva. It is usually easiest to use the +distribution package. The current version requires systemd 233 (or actually, systemd-nspawn of it). When not using distribution packages make sure to install the -necessary dependencies. For example, on *Fedora* you need: +necessary dependencies. For example, on *Fedora Linux* you need: ```bash dnf install arch-install-scripts btrfs-progs debootstrap dosfstools edk2-ovmf e2fsprogs squashfs-tools gnupg python3 tar veritysetup xfsprogs xz zypper sbsigntools diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 02118d47d..c5cdbd22b 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -1965,7 +1965,7 @@ def install_clear(args: CommandLineArguments, root: str, do_run_build_script: bo args.password = None -@complete_step("Installing Fedora") +@complete_step("Installing Fedora Linux") def install_fedora(args: CommandLineArguments, root: str, do_run_build_script: bool) -> None: if args.release == "rawhide": last = sorted(FEDORA_KEYS_MAP)[-1] -- 2.47.2