diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-26 12:46:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-26 12:46:17 +0200 |
commit | 71c14010dfa915644806429845bfb6118f7422ef (patch) | |
tree | f802496664dadee3d11c495b13af6383d0a74813 /src/systemctl/systemctl.c | |
parent | 8a3134b2b78b4ec310cd3f7b38fd0c9e09254aa8 (diff) | |
parent | 592288a2a78a3bd5b61b094f0512ce4806537b21 (diff) |
Merge pull request #3600 from poettering/fstab-generator-fixes
Fstab generator fixes
Diffstat (limited to 'src/systemctl/systemctl.c')
-rw-r--r-- | src/systemctl/systemctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 0a8e60c195..c0b285b58f 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6175,7 +6175,7 @@ static int unit_file_create_copy( if (response != 'y') { log_warning("%s ignored", unit_name); free(tmp_new_path); - return -1; + return -EKEYREJECTED; } } @@ -6307,10 +6307,8 @@ static int find_paths_to_edit(sd_bus *bus, char **names, char ***paths) { r = unit_file_create_copy(&lp, *name, path, &new_path, &tmp_path); else r = unit_file_create_new(&lp, *name, ".d/override.conf", &new_path, &tmp_path); - } else { + } else r = unit_file_create_new(&lp, *name, NULL, &new_path, &tmp_path); - } - if (r < 0) return r; |