From: Lennart Poettering Date: Fri, 23 Sep 2022 12:59:02 +0000 (+0200) Subject: tree-wide: use the term "initrd" at most places we so far used "initramfs" X-Git-Tag: v252-rc1~97^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32e276708089110243682d8aaa3d58075b91f0d6;p=thirdparty%2Fsystemd.git tree-wide: use the term "initrd" at most places we so far used "initramfs" In most cases we refernced the concept as "initrd". Let's convert most remaining uses of "initramfs" to "initrd" too, to stay internally consistent. This leaves "initramfs" only where it's relevant to explain historical concepts or where "initramfs" is part of the API (i.e. in /run/initramfs). Follow-up for: b66a6e1a5838b874b789820c090dd6850cf10513 --- diff --git a/man/bootup.xml b/man/bootup.xml index 62a34fe3d72..16bb9c0b3f8 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -31,9 +31,9 @@ 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 + 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 diff --git a/man/crypttab.xml b/man/crypttab.xml index 2a54c81595b..363691a007b 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -733,7 +733,7 @@ - Setup this encrypted block device in the initramfs, similarly to + Setup this encrypted block device in the initrd, similarly to systemd.mount5 units marked with . @@ -744,8 +744,8 @@ use. With this option the device will still be detached but later after the root file system is unmounted. - All other encrypted block devices that contain file systems mounted in the initramfs - should use this option. + All other encrypted block devices that contain file systems mounted in the initrd should use + this option. diff --git a/man/localectl.xml b/man/localectl.xml index a4bda2c4ba6..617922ebd58 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -48,11 +48,11 @@ such as the display manager, as well as the default for users after login. - Note that the changes performed using this tool might require - the initramfs to be rebuilt to take effect during early system boot. - The initramfs is not rebuilt automatically by localectl, - this task has to be performed manually, usually using a tool like - dracut8. + 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. Note that diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml index aa0d8b12aed..a9aa0ffd0a2 100644 --- a/man/systemd-fsck@.service.xml +++ b/man/systemd-fsck@.service.xml @@ -31,15 +31,12 @@ Description - systemd-fsck@.service and - systemd-fsck-root.service are services - responsible for file system checks. They are instantiated for each - device that is configured for file system checking. - systemd-fsck-root.service is responsible for - file system checks on the root file system, but only if the - root filesystem was not checked in the initramfs. - systemd-fsck@.service is used for all other - file systems and for the root file system in the initramfs. + systemd-fsck@.service and systemd-fsck-root.service are + services responsible for file system checks. They are instantiated for each device that is configured for + file system checking. systemd-fsck-root.service is responsible for file system + checks on the root file system, but only if the root filesystem was not checked in the initrd. + systemd-fsck@.service is used for all other file systems and for the root file + system in the initrd. These services are started at boot if in /etc/fstab for the diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml index df6e180ffcd..12cd4c331bd 100644 --- a/man/systemd-networkd.service.xml +++ b/man/systemd-networkd.service.xml @@ -54,13 +54,11 @@ systemd.network5. - When systemd-networkd exits, it generally leaves - existing network devices and configuration intact. This makes it possible to - transition from the initramfs and to restart the service without breaking - connectivity. This also means that when configuration is updated and - systemd-networkd is restarted, netdev interfaces for - which configuration was removed will not be dropped, and may need to be - cleaned up manually. + When systemd-networkd exits, it generally leaves existing network devices and + configuration intact. This makes it possible to transition from the initrd and to restart the service + without breaking connectivity. This also means that when configuration is updated and + systemd-networkd is restarted, netdev interfaces for which configuration was removed + will not be dropped, and may need to be cleaned up manually. systemd-networkd may be introspected and controlled at runtime using networkctl1. diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index e4e35f2dd86..773ca04cd6d 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -421,9 +421,8 @@ - An additional filesystem to be mounted in the - initramfs. See initrd-fs.target - description in + An additional filesystem to be mounted in the initrd. See + initrd-fs.target description in systemd.special7. diff --git a/man/systemd.special.xml b/man/systemd.special.xml index 1e3e6d8c3e3..85eb8ad0762 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -372,8 +372,8 @@ initrd.target - This is the default target in the initramfs, similar to default.target - in the main system. It is used to mount the real root and transition to it. See + This is the default target in the initrd, similar to default.target in + the main system. It is used to mount the real root and transition to it. See bootup7 for more discussion. diff --git a/man/udev.xml b/man/udev.xml index 886455f61f7..142f295f3e8 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -647,13 +647,11 @@ - Set the flag (sticky bit) on the udev database entry - of the event device. Device properties are then kept in the - database even when - udevadm info --cleanup-db is called. - This option can be useful in certain cases - (e.g. Device Mapper devices) for persisting device state - on the transition from initramfs. + Set the flag (sticky bit) on the udev database entry of the event device. Device + properties are then kept in the database even when udevadm info + --cleanup-db is called. This option can be useful in certain cases + (e.g. Device Mapper devices) for persisting device state on the transition from + initrd. diff --git a/man/veritytab.xml b/man/veritytab.xml index 71461591827..dc2f11c31e2 100644 --- a/man/veritytab.xml +++ b/man/veritytab.xml @@ -149,7 +149,7 @@ This is based on crypttab(5). - Setup this verity protected block device in the initramfs, similarly to + Setup this verity protected block device in the initrd, similarly to systemd.mount5 units marked with . @@ -160,8 +160,8 @@ This is based on crypttab(5). use. With this option the device will still be detached but later after the root file system is unmounted. - All other verity protected block devices that contain file systems mounted in the - initramfs should use this option. + All other verity protected block devices that contain file systems mounted in the initrd should + use this option. diff --git a/src/core/device.c b/src/core/device.c index b3cf77d50c6..a4fa8705410 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -281,13 +281,14 @@ static int device_coldplug(Unit *u) { * other units, or (b) generated when uevents are received. * * - On switch-root, the udev database may be cleared, except for devices with sticky bit, i.e. - * OPTIONS="db_persist". Hence, almost no devices are enumerated in the step 2. However, in general, - * we have several serialized devices. So, DEVICE_FOUND_UDEV bit in the deserialized_found must be - * ignored, as udev rules in initramfs and the main system are often different. If the deserialized - * state is DEVICE_PLUGGED, we need to downgrade it to DEVICE_TENTATIVE. Unlike the other starting - * mode, MANAGER_IS_SWITCHING_ROOT() is true when device_coldplug() and device_catchup() are called. - * Hence, let's conditionalize the operations by using the flag. After switch-root, systemd-udevd - * will (re-)process all devices, and the Device.found and Device.state will be adjusted. + * OPTIONS="db_persist". Hence, almost no devices are enumerated in the step 2. However, in + * general, we have several serialized devices. So, DEVICE_FOUND_UDEV bit in the deserialized_found + * must be ignored, as udev rules in initrd and the main system are often different. If the + * deserialized state is DEVICE_PLUGGED, we need to downgrade it to DEVICE_TENTATIVE. Unlike the + * other starting mode, MANAGER_IS_SWITCHING_ROOT() is true when device_coldplug() and + * device_catchup() are called. Hence, let's conditionalize the operations by using the + * flag. After switch-root, systemd-udevd will (re-)process all devices, and the Device.found and + * Device.state will be adjusted. * * - On reload or reexecute, we can trust enumerated_found, deserialized_found, and deserialized_state. * Of course, deserialized parameters may be outdated, but the unit state can be adjusted later by diff --git a/src/core/main.c b/src/core/main.c index 9ad208fdfca..9828d1f6d45 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1660,7 +1660,7 @@ static void initialize_coredump(bool skip_setup) { /* But at the same time, turn off the core_pattern logic by default, so that no coredumps are stored * until the systemd-coredump tool is enabled via sysctl. However it can be changed via the kernel - * command line later so core dumps can still be generated during early startup and in initramfs. */ + * command line later so core dumps can still be generated during early startup and in initrd. */ if (!skip_setup) disable_coredumps(); #endif diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index f591407f782..82c2a564932 100644 --- a/src/hibernate-resume/hibernate-resume-generator.c +++ b/src/hibernate-resume/hibernate-resume-generator.c @@ -114,7 +114,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) arg_dest = ASSERT_PTR(dest); - /* Don't even consider resuming outside of initramfs. */ + /* Don't even consider resuming outside of initrd. */ if (!in_initrd()) { log_debug("Not running in an initrd, quitting."); return 0; diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index d59c783dbc4..486b093062f 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -706,8 +706,8 @@ static void context_determine_hostname_source(Context *c) { /* If the hostname was not set by us, try to figure out where it came from. If we set it to * the default hostname, the file will tell us. We compare the string because it is possible - * that the hostname was set by an older version that had a different fallback, in the - * initramfs or before we reexecuted. */ + * that the hostname was set by an older version that had a different fallback, in the initrd + * or before we reexecuted. */ r = read_one_line_file("/run/systemd/default-hostname", &fallback); if (r < 0 && r != -ENOENT) diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index 9e120f734ef..f6041c71657 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -897,10 +897,8 @@ int device_update_db(sd_device *device) { if (r < 0) return r; - /* - * set 'sticky' bit to indicate that we should not clean the - * database when we transition from initramfs to the real root - */ + /* set 'sticky' bit to indicate that we should not clean the database when we transition from initrd + * to the real root */ if (fchmod(fileno(f), device->db_persist ? 01644 : 0644) < 0) { r = -errno; goto fail; diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index d919533f4a3..a54f1464bac 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -1270,10 +1270,9 @@ int setup_pivot_root(const char *directory, const char *pivot_root_new, const ch * This requires a temporary directory, pivot_tmp, which is * not a child of either. * - * This is typically used for OSTree-style containers, where - * the root partition contains several sysroots which could be - * run. Normally, one would be chosen by the bootloader and - * pivoted to / by initramfs. + * This is typically used for OSTree-style containers, where the root partition contains several + * sysroots which could be run. Normally, one would be chosen by the bootloader and pivoted to / by + * initrd. * * For example, for an OSTree deployment, pivot_root_new * would be: /ostree/deploy/$os/deploy/$checksum. Note that this diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c index e8b04e879f5..bae06a81ad9 100644 --- a/src/test/test-exec-util.c +++ b/src/test/test-exec-util.c @@ -330,11 +330,9 @@ TEST(environment_gathering) { assert_se(chmod(name2, 0755) == 0); assert_se(chmod(name3, 0755) == 0); - /* When booting in containers or without initramfs there might not be - * any PATH in the environment and if there is no PATH /bin/sh built-in - * PATH may leak and override systemd's DEFAULT_PATH which is not - * good. Force our own PATH in environment, to prevent expansion of sh - * built-in $PATH */ + /* When booting in containers or without initrd there might not be any PATH in the environment and if + * there is no PATH /bin/sh built-in PATH may leak and override systemd's DEFAULT_PATH which is not + * good. Force our own PATH in environment, to prevent expansion of sh built-in $PATH */ old = getenv("PATH"); r = setenv("PATH", "no-sh-built-in-path", 1); assert_se(r >= 0); diff --git a/test/README.testsuite b/test/README.testsuite index 7e3d6c06237..fb77ad286e5 100644 --- a/test/README.testsuite +++ b/test/README.testsuite @@ -98,8 +98,8 @@ INTERACTIVE_DEBUG=1 (e.g. by setting a usable default terminal, suppressing the shutdown after the test, etc.) -The kernel and initramfs can be specified with $KERNEL_BIN and $INITRD. -(Fedora's or Debian's default kernel path and initramfs are used by default) +The kernel and initrd can be specified with $KERNEL_BIN and $INITRD. (Fedora's +or Debian's default kernel path and initrd are used by default) A script will try to find your qemu binary. If you want to specify a different one with $QEMU_BIN. diff --git a/test/test-functions b/test/test-functions index fa3ad9fbdc6..149b7e45b61 100644 --- a/test/test-functions +++ b/test/test-functions @@ -2707,7 +2707,7 @@ inst() { # inst_any -d /bin/foo /bin/bar /bin/baz # # Lets assume that /bin/baz exists, so it will be installed as /bin/foo in -# initramfs. +# initrd. inst_any() { local dest file