dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

integritysetup: rename action → verb, to match other code

Browse Source
This commit is contained in:
Lennart Poettering
2022-03-31 11:20:01 +02:00
parent 542bb9be7c
commit 042fcbbf7e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/integritysetup/integritysetup.c
View File

@@ -88,8 +88,8 @@ static const char *integrity_algorithm_select(const void *key_file_buf) {
static int run(int argc, char *argv[]) {
_cleanup_(crypt_freep) struct crypt_device *cd = NULL;
char *verb, *volume;
int r;
char *action, *volume;
if (argv_looks_like_help(argc, argv))
return help();
@@ -97,7 +97,7 @@ static int run(int argc, char *argv[]) {
if (argc < 3)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program requires at least two arguments.");
action = argv[1];
verb = argv[1];
volume = argv[2];
log_setup();
@@ -106,7 +106,7 @@ static int run(int argc, char *argv[]) {
umask(0022);
if (streq(action, "attach")) {
if (streq(verb, "attach")) {
/* attach name device optional_key_file optional_options */
crypt_status_info status;
@@ -169,7 +169,7 @@ static int run(int argc, char *argv[]) {
if (r < 0)
return log_error_errno(r, "Failed to set up integrity device: %m");
} else if (streq(action, "detach")) {
} else if (streq(verb, "detach")) {
if (argc > 3)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "detach has a maximum of two arguments.");
@@ -187,7 +187,7 @@ static int run(int argc, char *argv[]) {
return log_error_errno(r, "Failed to deactivate: %m");
} else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown verb %s.", action);
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown verb %s.", verb);
return 0;
}