From 85c8217db0d345eb941392326f6a0734010d72b0 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 3 Jan 2017 10:08:18 -0500 Subject: [PATCH] docs: override is not the same as overwrite! Some docs claimed that values in certain config files would be overwritten, when they would actually be overridden. Override: a file is not modified but its contents are superseded by something else. (configurations set in /etc/dracut.conf.d/*.conf override configurations set in /etc/dracut.conf) Overwrite: a file is modified or its contents replaced by an action (use dracut --force to overwrite the existing initramfs) --- dracut.cmdline.7.asc | 2 +- dracut.conf.5.asc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc index 7fc4499f..36d56561 100644 --- a/dracut.cmdline.7.asc +++ b/dracut.cmdline.7.asc @@ -612,7 +612,7 @@ NFS method. This is supported by dracut, but not recommended. **rd.nfs.domain=**____:: - Set the NFSv4 domain name. Will overwrite the settings in _/etc/idmap.conf_. + Set the NFSv4 domain name. Will override the settings in _/etc/idmap.conf_. **rd.net.dhcp.retry=**____:: If this option is set, dracut will try to connect via dhcp times before failing. diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc index 318024a9..6e1155b5 100644 --- a/dracut.conf.5.asc +++ b/dracut.conf.5.asc @@ -17,17 +17,17 @@ _/usr/lib/dracut/dracut.conf.d/*.conf_ Description ----------- _dracut.conf_ is loaded during the initialisation phase of dracut. Command line -parameter will overwrite any values set here. +parameter will override any values set here. _*.conf_ files are read from /usr/lib/dracut/dracut.conf.d and /etc/dracut.conf.d. Files with the same name in /etc/dracut.conf.d will replace files in /usr/lib/dracut/dracut.conf.d. -The files are then read in alphanumerical order and will overwrite parameters +The files are then read in alphanumerical order and will override parameters set in _/etc/dracut.conf_. Each line specifies an attribute and a value. A '#' indicates the beginning of a comment; following characters, up to the end of the line are not interpreted. -dracut command line options will overwrite any values set here. +dracut command line options will override any values set here. Configuration files must have the extension .conf; other extensions are ignored. @@ -218,7 +218,7 @@ _/etc/dracut.conf_:: _/etc/dracut.conf.d/_. _/etc/dracut.conf.d/_:: - Any _/etc/dracut.conf.d/*.conf_ file can overwrite the values in + Any _/etc/dracut.conf.d/*.conf_ file can override the values in _/etc/dracut.conf_. The configuration files are read in alphanumerical order.