chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: rework generator logic
[elogind.git]
/
src
/
getty-generator
/
getty-generator.c
diff --git
a/src/getty-generator/getty-generator.c
b/src/getty-generator/getty-generator.c
index 58ad8a66358e4b8a5d2cefc2d2e3d9321c8d19be..85600263f9cce42a8ce8310bb5488473ad580e7b 100644
(file)
--- a/
src/getty-generator/getty-generator.c
+++ b/
src/getty-generator/getty-generator.c
@@
-38,8
+38,8
@@
static int add_symlink(const char *fservice, const char *tservice) {
assert(fservice);
assert(tservice);
assert(fservice);
assert(tservice);
-
asprintf(&from, SYSTEM_DATA_UNIT_PATH "/%s
", fservice);
-
asprintf(&to, "%s/getty.target.wants/%s", arg_dest, tservice
);
+
from = strappend(SYSTEM_DATA_UNIT_PATH "/
", fservice);
+
to = join(arg_dest,"/getty.target.wants/", tservice, NULL
);
if (!from || !to) {
log_error("Out of memory");
if (!from || !to) {
log_error("Out of memory");
@@
-99,24
+99,24
@@
int main(int argc, char *argv[]) {
char *active;
const char *j;
char *active;
const char *j;
- if (argc >
2
) {
- log_error("This program takes
on
e or no arguments.");
+ if (argc >
1 && argc != 4
) {
+ log_error("This program takes
thre
e or no arguments.");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- log_set_target(LOG_TARGET_AUTO);
+ if (argc > 1)
+ arg_dest = argv[1];
+
+ log_set_target(LOG_TARGET_SAFE);
log_parse_environment();
log_open();
umask(0022);
log_parse_environment();
log_open();
umask(0022);
- if (argc > 1)
- arg_dest = argv[1];
-
if (detect_container(NULL) > 0) {
log_debug("Automatically adding console shell.");
if (detect_container(NULL) > 0) {
log_debug("Automatically adding console shell.");
- if (add_symlink("console-
shell.service", "console-shell
.service") < 0)
+ if (add_symlink("console-
getty.service", "console-getty
.service") < 0)
r = EXIT_FAILURE;
/* Don't add any further magic if we are in a container */
r = EXIT_FAILURE;
/* Don't add any further magic if we are in a container */