diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index 56307003f9..977fe8285d 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -144,7 +144,7 @@ might still be busy with completing start-up. Kernel start-up required @KERNEL_USEC@ microseconds. -Initial RAM disk start-up required @INITRD_USEC@ microseconds. +initrd start-up required @INITRD_USEC@ microseconds. Userspace start-up required @USERSPACE_USEC@ microseconds. diff --git a/docs/CREDENTIALS.md b/docs/CREDENTIALS.md index 70e2ea36d5..9e16dd3ba4 100644 --- a/docs/CREDENTIALS.md +++ b/docs/CREDENTIALS.md @@ -282,8 +282,8 @@ services where they are ultimately consumed. EFI System Partition, which are then picked up by `systemd-stub` and passed to the kernel and ultimately userspace where systemd receives them. This is useful to implement secure parameterization of vendor-built and signed - initial RAM disks, as userspace can place credentials next to these EFI - kernels, and be sure they can be accessed securely from initrd context. + initrds, as userspace can place credentials next to these EFI kernels, and + be sure they can be accessed securely from initrd context. Credentials passed to the system may be enumerated/displayed via `systemd-creds --system`. They may also be propagated down to services, via the diff --git a/docs/INITRD_INTERFACE.md b/docs/INITRD_INTERFACE.md index 7e8f028ef8..6a54f9f7a6 100644 --- a/docs/INITRD_INTERFACE.md +++ b/docs/INITRD_INTERFACE.md @@ -8,15 +8,16 @@ SPDX-License-Identifier: LGPL-2.1-or-later # The initrd Interface of systemd -The Linux initrd mechanism (short for "initial RAM disk") refers to a small -file system archive that is unpacked by the kernel and contains the first -userspace code that runs. It typically finds and transitions into the actual -root file system to use. systemd supports both 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. +The Linux initrd mechanism (short for "initial RAM disk", also known as +"initramfs") refers to a small file system archive that is unpacked by the +kernel and contains the first userspace code that runs. It typically finds and +transitions into the actual root file system to use. systemd supports both +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. * 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 @@ -57,10 +58,10 @@ It's all already implemented there! It is also possible and recommended to implement the initrd itself based on systemd. Here are a few terse notes: -* Provide `/etc/initrd-release` in the initrd image. The idea is that it follows - the same format as the usual `/etc/os-release` but describes the initial RAM - disk implementation rather than the OS. systemd uses the existence of this - file as a flag whether to run in initial RAM disk mode, or not. +* Provide `/etc/initrd-release` in the initrd image. The idea is that it + follows the same format as the usual `/etc/os-release` but describes the + initrd implementation rather than the OS. systemd uses the existence of this + file as a flag whether to run in initrd mode, or not. * When run in initrd mode, systemd and its components will read a couple of additional command line arguments, which are generally prefixed with `rd.` diff --git a/docs/RANDOM_SEEDS.md b/docs/RANDOM_SEEDS.md index 9ac7d00b2e..3dc27f5552 100644 --- a/docs/RANDOM_SEEDS.md +++ b/docs/RANDOM_SEEDS.md @@ -102,9 +102,9 @@ random bytes will either be delayed, will fail or result in a noisy kernel log message (see above). Various other components run during early boot that require random bytes. For -example, initial RAM disks nowadays communicate with encrypted networks or -access encrypted storage which might need random numbers. systemd itself -requires random numbers as well, including for the following uses: +example, initrds nowadays communicate with encrypted networks or access +encrypted storage which might need random numbers. systemd itself requires +random numbers as well, including for the following uses: * systemd assigns 'invocation' UUIDs to all services it invokes that uniquely identify each invocation. This is useful retain a global handle on a specific @@ -174,9 +174,9 @@ boot, in order to ensure the entropy pool is filled up quickly. be enabled by setting the `$SYSTEMD_RANDOM_SEED_CREDIT` environment variable for the service to `1` (or even `force`, see man page). Note however, that this service typically runs relatively late during early boot: long after - the initial RAM disk (`initrd`) completed, and after the `/var/` file system - became writable. This is usually too late for many applications, it is hence - not advised to rely exclusively on this functionality to seed the kernel's + the initrd completed, and after the `/var/` file system became + writable. This is usually too late for many applications, it is hence not + advised to rely exclusively on this functionality to seed the kernel's entropy pool. Also note that this service synchronously waits until the kernel's entropy pool is initialized before completing start-up. It may thus be used by other services as synchronization point to order against, if they diff --git a/docs/ROOT_STORAGE_DAEMONS.md b/docs/ROOT_STORAGE_DAEMONS.md index 3b19ea79d1..2d17f3f2dc 100644 --- a/docs/ROOT_STORAGE_DAEMONS.md +++ b/docs/ROOT_STORAGE_DAEMONS.md @@ -22,16 +22,16 @@ is not. ## A Bit of Background When complex storage technologies are used as backing for the root file system -this needs to be set up by the initial RAM file system (initrd), i.e. on Fedora -by Dracut. In newer systemd versions tear-down of the root file system backing -is also done by the initrd: after terminating all remaining running processes -and unmounting all file systems it can (which means excluding the root fs) -systemd will jump back into the initrd code allowing it to unmount the final -file systems (and its storage backing) that could not be unmounted as long as -the OS was still running from the main root file system. The initrd' job is to -detach/unmount the root fs, i.e. inverting the exact commands it used to set -them up in the first place. This is not only cleaner, but also allows for the -first time arbitrary complex stacks of storage technology. +this needs to be set up by the initrd, i.e. on Fedora by Dracut. In newer +systemd versions tear-down of the root file system backing is also done by the +initrd: after terminating all remaining running processes and unmounting all +file systems it can (which means excluding the root fs) systemd will jump back +into the initrd code allowing it to unmount the final file systems (and its +storage backing) that could not be unmounted as long as the OS was still +running from the main root file system. The initrd' job is to detach/unmount +the root fs, i.e. inverting the exact commands it used to set them up in the +first place. This is not only cleaner, but also allows for the first time +arbitrary complex stacks of storage technology. Previous attempts to handle root file system setups with complex storage as backing usually tried to maintain the root storage with program code stored on diff --git a/docs/UIDS-GIDS.md b/docs/UIDS-GIDS.md index e90d6f0596..57e8f4d4f5 100644 --- a/docs/UIDS-GIDS.md +++ b/docs/UIDS-GIDS.md @@ -73,7 +73,7 @@ Note that systemd requires that system users and groups are resolvable without networking available — a requirement that is not made for regular users. This means regular users may be stored in remote LDAP or NIS databases, but system users may not (except when there's a consistent local cache kept, that is -available during earliest boot, including in the initial RAM disk). +available during earliest boot, including in the initrd). ## Special `systemd` GIDs diff --git a/man/bootup.xml b/man/bootup.xml index 62a34fe3d7..4004e43d7f 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 @@ -200,10 +200,10 @@ emergency.service | | | - Bootup in the Initial RAM Disk (initrd) - The initial RAM disk implementation (initrd) can be set up - using systemd as well. In this case, boot up inside the initrd - follows the following structure. + Bootup in the initrd + + The initrd implementation can be set up using systemd as well. In this case, boot up inside the + initrd follows the following structure. systemd detects that it is run within an initrd by checking for the file /etc/initrd-release. diff --git a/man/crypttab.xml b/man/crypttab.xml index 2a54c81595..363691a007 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 a4bda2c4ba..617922ebd5 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-analyze.xml b/man/systemd-analyze.xml index 5789b61a0a..13b881cfc7 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -156,10 +156,10 @@ <command>systemd-analyze time</command> This command prints the time spent in the kernel before userspace has been reached, the time - spent in the initial RAM disk (initrd) before normal system userspace has been reached, and the time - normal system userspace took to initialize. Note that these measurements simply measure the time passed - up to the point where all system services have been spawned, but not necessarily until they fully - finished initialization or the disk is idle. + spent in the initrd before normal system userspace has been reached, and the time normal system + userspace took to initialize. Note that these measurements simply measure the time passed up to the + point where all system services have been spawned, but not necessarily until they fully finished + initialization or the disk is idle. <command>Show how long the boot took</command> diff --git a/man/systemd-creds.xml b/man/systemd-creds.xml index 1e97e2609b..1e5632e63d 100644 --- a/man/systemd-creds.xml +++ b/man/systemd-creds.xml @@ -304,8 +304,8 @@ The switch is a shortcut for . Similar, is a shortcut for . - When encrypting credentials that shall be used in the initial RAM disk (initrd) where - /var/lib/systemd/ is typically not available make sure to use + When encrypting credentials that shall be used in the initrd (where + /var/lib/systemd/ is typically not available) make sure to use mode, to disable binding against the host secret. This switch has no effect on the decrypt command, as information on which diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml index aa0d8b12ae..a9aa0ffd0a 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-measure.xml b/man/systemd-measure.xml index 459ed6592f..5ad30c6511 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -35,8 +35,8 @@ systemd-measure is a tool that may be used to pre-calculate and sign the expected TPM2 PCR 11 values that should be seen when a unified Linux kernel image based on systemd-stub7 is - booted up. It accepts paths to the ELF kernel image file, initial ram disk image file, devicetree file, - kernel command line file, + booted up. It accepts paths to the ELF kernel image file, initrd image file, devicetree file, kernel + command line file, os-release5 file, boot splash file, and TPM2 PCR PEM public key file that make up the unified kernel image, and determines the PCR values expected to be in place after booting the image. Calculation starts with a zero-initialized diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml index df6e180ffc..12cd4c331b 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-veritysetup-generator.xml b/man/systemd-veritysetup-generator.xml index 9e3e15b6ba..331b5c07bc 100644 --- a/man/systemd-veritysetup-generator.xml +++ b/man/systemd-veritysetup-generator.xml @@ -51,10 +51,10 @@ systemd.verity= rd.systemd.verity= - Takes a boolean argument. Defaults to yes. If no, - disables the generator entirely. rd.systemd.verity= is honored only by the initial RAM disk - (initrd) while systemd.verity= is honored by both the host system and the - initrd. + Takes a boolean argument. Defaults to yes. If + no, disables the generator entirely. rd.systemd.verity= is + honored only by the initrd while systemd.verity= is honored by both the host + system and the initrd. diff --git a/man/systemd-volatile-root.service.xml b/man/systemd-volatile-root.service.xml index d591da2f77..e55526070c 100644 --- a/man/systemd-volatile-root.service.xml +++ b/man/systemd-volatile-root.service.xml @@ -37,9 +37,10 @@ stateless systems. This service is only enabled if full volatile mode is selected, for example by specifying - systemd.volatile=yes on the kernel command line. This service runs only in the initial RAM disk - ("initrd"), before the system transitions to the host's root directory. Note that this service is not used if - systemd.volatile=state is used, as in that mode the root directory is non-volatile. + systemd.volatile=yes on the kernel command line. This service runs only in the initrdyes, + before the system transitions to the host's root directory. Note that this service is not used if + systemd.volatile=state is used, as in that mode the root directory is + non-volatile. diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml index d837afb6f9..19ec586fa0 100644 --- a/man/systemd.generator.xml +++ b/man/systemd.generator.xml @@ -148,10 +148,9 @@ $SYSTEMD_IN_INITRD - If the generator is run as part of an initial RAM file system (initrd) this is set to - 1. If it is run from the regular host (i.e. after the transition from initrd to - host) it is set to 0. This environment variable is only set for system - generators. + If the generator is run as part of an initrd this is set to 1. If + it is run from the regular host (i.e. after the transition from initrd to host) it is set to + 0. This environment variable is only set for system generators. diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 68581a21cc..caedb6e4ae 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -403,8 +403,8 @@ A string field that specifies the runtime scope in which the message was logged. If initrd, the log message was processed while the system was running inside the - initial RAM disk (initrd). If system, the log message was generated after the - system switched execution to the host root filesystem. + initrd. If system, the log message was generated after the system switched + execution to the host root filesystem. diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml index e4e35f2dd8..773ca04cd6 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 1e3e6d8c3e..85eb8ad076 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/systemd.xml b/man/systemd.xml index 99b6f11b90..f4213e2ee8 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -752,16 +752,12 @@ systemd.unit= rd.systemd.unit= - Overrides the unit to activate on boot. - Defaults to default.target. This may be - used to temporarily boot into a different boot unit, for - example rescue.target or - emergency.service. See + Overrides the unit to activate on boot. Defaults to + default.target. This may be used to temporarily boot into a different boot unit, + for example rescue.target or emergency.service. See systemd.special7 - for details about these units. The option prefixed with - rd. is honored only in the initial RAM disk - (initrd), while the one that is not prefixed only in the main - system. + for details about these units. The option prefixed with rd. is honored only in the + initrd, while the one that is not prefixed only in the main system. diff --git a/man/udev.xml b/man/udev.xml index 886455f61f..142f295f3e 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 7146159182..dc2f11c31e 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 b3cf77d50c..a4fa870541 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 9ad208fdfc..27ed8a89ba 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 @@ -1858,7 +1858,7 @@ static int do_reexecute( args[i++] = argv[j]; assert(i <= args_size); - /* Re-enable any blocked signals, especially important if we switch from initial ramdisk to init=... */ + /* Re-enable any blocked signals, especially important if we switch from initrd to init=... */ (void) reset_all_signal_handlers(); (void) reset_signal_mask(); (void) rlimit_nofile_safe(); @@ -2052,7 +2052,7 @@ static void log_execution_mode(bool *ret_first_boot) { if (in_initrd()) { *ret_first_boot = false; - log_info("Running in initial RAM disk."); + log_info("Running in initrd."); } else { int r; _cleanup_free_ char *id_text = NULL; diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c index f591407f78..82c2a56493 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 d59c783dbc..486b093062 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 9e120f734e..f6041c7165 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 d919533f4a..a54f1464ba 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 e8b04e879f..bae06a81ad 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 ac7cd361e7..40240599a0 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 d3ebfe0f51..716aa63107 100644 --- a/test/test-functions +++ b/test/test-functions @@ -2716,7 +2716,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