diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-11 06:01:13 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-11 06:07:03 +0900 |
| commit | 6fdc9fbc0f7e6c30aa01ef7284c29f5ab6b47e93 (patch) | |
| tree | ebfa3a04e904714a480e4788f876a997c4b06d2c /src/udev | |
| parent | 8352a29b6d8cecdcfa61c44f898aac76b3183e27 (diff) | |
| download | systemd-6fdc9fbc0f7e6c30aa01ef7284c29f5ab6b47e93.tar.gz | |
udev/scsi_id: rename positional arguments
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/scsi_id/scsi_id.c | 10 | ||||
| -rw-r--r-- | src/udev/scsi_id/scsi_serial.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 364d567705..e7d8da7c50 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -32,8 +32,10 @@ static const struct option options[] = { { "device", required_argument, NULL, 'd' }, { "config", required_argument, NULL, 'f' }, { "page", required_argument, NULL, 'p' }, - { "blacklisted", no_argument, NULL, 'b' }, - { "whitelisted", no_argument, NULL, 'g' }, + { "denylisted", no_argument, NULL, 'b' }, + { "allowlisted", no_argument, NULL, 'g' }, + { "blacklisted", no_argument, NULL, 'b' }, /* backward compat */ + { "whitelisted", no_argument, NULL, 'g' }, /* backward compat */ { "replace-whitespace", no_argument, NULL, 'u' }, { "sg-version", required_argument, NULL, 's' }, { "verbose", no_argument, NULL, 'v' }, @@ -222,8 +224,8 @@ static void help(void) { " -f --config= Location of config file\n" " -p --page=0x80|0x83|pre-spc3-83 SCSI page (0x80, 0x83, pre-spc3-83)\n" " -s --sg-version=3|4 Use SGv3 or SGv4\n" - " -b --blacklisted Treat device as blacklisted\n" - " -g --whitelisted Treat device as whitelisted\n" + " -b --denylisted Treat device as denylisted\n" + " -g --allowlisted Treat device as allowlisted\n" " -u --replace-whitespace Replace all whitespace by underscores\n" " -v --verbose Verbose logging\n" " -x --export Print values as environment keys\n", diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index c619506877..a271b1786c 100644 --- a/src/udev/scsi_id/scsi_serial.c +++ b/src/udev/scsi_id/scsi_serial.c @@ -161,7 +161,7 @@ static int scsi_dump_sense(struct scsi_id_device *dev_scsi, * Figure out and print the sense key, asc and ascq. * * If you want to suppress these for a particular drive model, add - * a black list entry in the scsi_id config file. + * a deny list entry in the scsi_id config file. * * XXX We probably need to: lookup the sense/asc/ascq in a retry * table, and if found return 1 (after dumping the sense, asc, and |