From: Daan De Meyer Date: Fri, 19 Jan 2024 13:21:24 +0000 (+0100) Subject: Remove a few references to dracut X-Git-Tag: v256-rc1~1052 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98118c44ae700e62a8acf36f6ed7d347c2c5503c;p=thirdparty%2Fsystemd.git Remove a few references to dracut Let's remove some explicit references to dracut as we prefer initrds built with mkosi these days. --- diff --git a/README b/README index 9f314dd144f..d6ff8fa6be2 100644 --- a/README +++ b/README @@ -231,7 +231,6 @@ REQUIREMENTS: dbus >= 1.4.0 (strictly speaking optional, but recommended) NOTE: If using dbus < 1.9.18, you should override the default policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d). - dracut (optional) polkit (optional) To build in directory build/: diff --git a/docs/INITRD_INTERFACE.md b/docs/INITRD_INTERFACE.md index de91ba73958..4e856f89177 100644 --- a/docs/INITRD_INTERFACE.md +++ b/docs/INITRD_INTERFACE.md @@ -16,8 +16,9 @@ initrd and initrd-less boots. If an initrd is used, it is a good idea to pass a few bits of runtime information from the initrd to systemd in order to avoid duplicate work and to provide performance data to the administrator. In this page we attempt to roughly describe the interfaces that exist between the -initrd and systemd. These interfaces are currently used by dracut and the -ArchLinux initrds. +initrd and systemd. These interfaces are currently used by +[mkosi](https://github.com/systemd/mkosi)-generated initrds, dracut and the +Arch Linux initrds. * The initrd should mount `/run/` as a tmpfs and pass it pre-mounted when jumping into the main system when executing systemd. The mount options should @@ -49,10 +50,6 @@ implemented as an actual ramdisk, ramfs or tmpfs. We recommend using _initrd_ in this sense as a term that is unrelated to the actual backing technologies used. -Oh, and one last question before closing: instead of implementing these -features in your own distro's initrd, may I suggest just using Dracut instead? -It's all already implemented there! - ## Using systemd inside an initrd It is also possible and recommended to implement the initrd itself based on diff --git a/docs/PORTABILITY_AND_STABILITY.md b/docs/PORTABILITY_AND_STABILITY.md index 82aefc742df..2854857d2b3 100644 --- a/docs/PORTABILITY_AND_STABILITY.md +++ b/docs/PORTABILITY_AND_STABILITY.md @@ -83,7 +83,7 @@ And now, here's the list of (hopefully) all APIs that we have introduced with sy | [hostnamed](https://www.freedesktop.org/software/systemd/man/org.freedesktop.hostname1.html) | D-Bus | yes | yes | GNOME | yes | [Ubuntu](https://launchpad.net/ubuntu/+source/ubuntu-system-service), [Gentoo](http://www.gentoo.org/proj/en/desktop/gnome/openrc-settingsd.xml), [BSD](http://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=summary) | partially | | [localed](https://www.freedesktop.org/software/systemd/man/org.freedesktop.locale1.html) | D-Bus | yes | yes | GNOME | yes | [Ubuntu](https://launchpad.net/ubuntu/+source/ubuntu-system-service), [Gentoo](http://www.gentoo.org/proj/en/desktop/gnome/openrc-settingsd.xml), [BSD](http://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=summary) | partially | | [timedated](https://www.freedesktop.org/software/systemd/man/org.freedesktop.timedate1.html) | D-Bus | yes | yes | GNOME | yes | [Gentoo](http://www.gentoo.org/proj/en/desktop/gnome/openrc-settingsd.xml), [BSD](http://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=summary) | partially | -| [initrd interface](INITRD_INTERFACE.md) | Environment, flag files | yes | yes | dracut, ArchLinux | yes | ArchLinux | no | +| [initrd interface](INITRD_INTERFACE.md) | Environment, flag files | yes | yes | mkosi, dracut, ArchLinux | yes | ArchLinux | no | | [Container interface](CONTAINER_INTERFACE.md) | Environment, Mounts | yes | yes | libvirt/LXC | yes | - | no | | [Boot Loader interface](BOOT_LOADER_INTERFACE.md) | EFI variables | yes | yes | gummiboot | yes | - | no | | [Service bus API](https://www.freedesktop.org/software/systemd/man/org.freedesktop.systemd1.html) | D-Bus | yes | yes | system-config-services | no | - | no | diff --git a/man/bootup.xml b/man/bootup.xml index b9a740a49ab..f8c518a9366 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -31,13 +31,12 @@ boot loader will then invoke an OS kernel from disk (or the network). On systems using EFI or other types of firmware, this firmware may also load the kernel directly. - The kernel (optionally) mounts an in-memory file system, often generated by dracut8, which - looks for the root file system. Nowadays this is implemented as an "initramfs" — a compressed CPIO - archive that the kernel extracts into a tmpfs. In the past normal file systems using an in-memory block - device (ramdisk) were used, and the name "initrd" is still used to describe both concepts. It's the boot - loader or the firmware that loads both the kernel and initrd/initramfs images into memory, but the kernel - which interprets it as a file system. + The kernel (optionally) mounts an in-memory file system, which looks for the root file system. + Nowadays this is implemented as an "initramfs" — a compressed CPIO archive that the kernel extracts into + a tmpfs. In the past normal file systems using an in-memory block device (ramdisk) were used, and the + name "initrd" is still used to describe both concepts. It's the boot loader or the firmware that loads + both the kernel and initrd/initramfs images into memory, but the kernel which interprets it as a file + system. systemd1 may be used to manage services in the initrd, similarly to the real system. @@ -351,7 +350,6 @@ systemd-reboot.service | | | systemd.special7 systemd.target5 systemd-halt.service8 - dracut8 diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index ded41ffc36c..8f179deec83 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -40,10 +40,8 @@ and bootparam7. - For command line parameters understood by the initrd, see - dracut.cmdline7, - or the documentation of the specific initrd implementation of your - installation. + For command line parameters understood by the initrd, see the documentation of the specific initrd + implementation of your installation. @@ -728,7 +726,6 @@ bootparam7 systemd.system-credentials7 smbios-type-117 - dracut.cmdline7 systemd-debug-generator8 systemd-fsck@.service8 systemd-quotacheck.service8 diff --git a/man/localectl.xml b/man/localectl.xml index cfcf408a3b1..e18462abab1 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -50,10 +50,8 @@ Note that the changes performed using this tool might require the initrd to be rebuilt to take effect during early system boot. The initrd is not rebuilt automatically by - localectl, this task has to be performed manually, usually using a tool like - dracut8. - + localectl, this task has to be performed manually, usually by reinstalling the + distribution's kernel package. Note that systemd-firstboot1 @@ -222,7 +220,6 @@ systemctl1 systemd-localed.service8 systemd-firstboot1 - dracut8 diff --git a/man/os-release.xml b/man/os-release.xml index 7ea684b57f8..afdb21fc57b 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -62,7 +62,7 @@ compatibility with applications only looking at /etc/. A relative symlink instead of an absolute symlink is necessary to avoid breaking the link in a - chroot or initrd environment such as dracut. + chroot or initrd environment. os-release contains data that is defined by the operating system vendor and should generally not be