tree-wide: avoid some loaded terms
https://tools.ietf.org/html/draft-knodel-terminology-02 https://lwn.net/Articles/823224/ This gets rid of most but not occasions of these loaded terms: 1. scsi_id and friends are something that is supposed to be removed from our tree (see #7594) 2. The test suite defines an API used by the ubuntu CI. We can remove this too later, but this needs to be done in sync with the ubuntu CI. 3. In some cases the terms are part of APIs we call or where we expose concepts the kernel names the way it names them. (In particular all remaining uses of the word "slave" in our codebase are like this, it's used by the POSIX PTY layer, by the network subsystem, the mount API and the block device subsystem). Getting rid of the term in these contexts would mean doing some major fixes of the kernel ABI first. Regarding the replacements: when whitelist/blacklist is used as noun we replace with with allow list/deny list, and when used as verb with allow-list/deny-list.
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
b18573e16f
commit
6b000af4f2
@@ -39,7 +39,7 @@ static bool arg_enabled = true;
|
||||
static bool arg_read_crypttab = true;
|
||||
static const char *arg_crypttab = NULL;
|
||||
static const char *arg_runtime_directory = NULL;
|
||||
static bool arg_whitelist = false;
|
||||
static bool arg_allow_list = false;
|
||||
static Hashmap *arg_disks = NULL;
|
||||
static char *arg_default_options = NULL;
|
||||
static char *arg_default_keyfile = NULL;
|
||||
@@ -495,7 +495,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
|
||||
if (!d)
|
||||
return log_oom();
|
||||
|
||||
d->create = arg_whitelist = true;
|
||||
d->create = arg_allow_list = true;
|
||||
|
||||
} else if (streq(key, "luks.options")) {
|
||||
|
||||
@@ -559,7 +559,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
|
||||
if (!d)
|
||||
return log_oom();
|
||||
|
||||
d->create = arg_whitelist = true;
|
||||
d->create = arg_allow_list = true;
|
||||
|
||||
free_and_replace(d->name, uuid_value);
|
||||
} else
|
||||
@@ -622,7 +622,7 @@ static int add_crypttab_devices(void) {
|
||||
if (uuid)
|
||||
d = hashmap_get(arg_disks, uuid);
|
||||
|
||||
if (arg_whitelist && !d) {
|
||||
if (arg_allow_list && !d) {
|
||||
log_info("Not creating device '%s' because it was not specified on the kernel command line.", name);
|
||||
continue;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user