diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-19 17:21:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-19 17:21:18 +0200 |
| commit | 0c1792efe422622c3c8a11b70a722147304da4cb (patch) | |
| tree | 56aa22070f066ff3636625b2e0a70f7ced73450a /src/run/run.c | |
| parent | 0c7739039b090a2c1f8c894c0e6eb75fc25663a0 (diff) | |
| parent | 5cfde70c6e7c8afcd2c9cdb3505301c3e6cde6da (diff) | |
Merge pull request #3055 from keszybz/preset-fixes
Another bunch of improvements to the installation code
Diffstat (limited to 'src/run/run.c')
| -rw-r--r-- | src/run/run.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/run/run.c b/src/run/run.c index f92a7f4e2e..c0aa2c5924 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -125,7 +125,6 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, - ARG_NO_ASK_PASSWORD, ARG_USER, ARG_SYSTEM, ARG_SCOPE, @@ -133,12 +132,11 @@ static int parse_argv(int argc, char *argv[]) { ARG_DESCRIPTION, ARG_SLICE, ARG_SEND_SIGHUP, + ARG_SERVICE_TYPE, ARG_EXEC_USER, ARG_EXEC_GROUP, - ARG_SERVICE_TYPE, ARG_NICE, ARG_SETENV, - ARG_TTY, ARG_ON_ACTIVE, ARG_ON_BOOT, ARG_ON_STARTUP, @@ -147,6 +145,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_ON_CALENDAR, ARG_TIMER_PROPERTY, ARG_NO_BLOCK, + ARG_NO_ASK_PASSWORD, }; static const struct option options[] = { @@ -168,7 +167,8 @@ static int parse_argv(int argc, char *argv[]) { { "nice", required_argument, NULL, ARG_NICE }, { "setenv", required_argument, NULL, ARG_SETENV }, { "property", required_argument, NULL, 'p' }, - { "tty", no_argument, NULL, 't' }, + { "tty", no_argument, NULL, 't' }, /* deprecated */ + { "pty", no_argument, NULL, 't' }, { "quiet", no_argument, NULL, 'q' }, { "on-active", required_argument, NULL, ARG_ON_ACTIVE }, { "on-boot", required_argument, NULL, ARG_ON_BOOT }, |