getty-generator: ignore if symlinks already exist

This commit is contained in:
Lennart Poettering 2011-08-31 01:30:57 +02:00
parent 382241ee56
commit a17b785b5f

View File

@ -44,9 +44,15 @@ static int add_symlink(const char *fservice, const char *tservice) {
mkdir_parents(to, 0755); mkdir_parents(to, 0755);
if ((r = symlink(from, to)) < 0) { r = symlink(from, to);
log_error("Failed to create symlink from %s to %s: %m", from, to); if (r < 0) {
r = -errno; if (errno == EEXIST)
/* In case console=hvc is passed this will very likely result in EEXIST */
r = 0;
else {
log_error("Failed to create symlink from %s to %s: %m", from, to);
r = -errno;
}
} }
finish: finish:
@ -88,7 +94,8 @@ int main(int argc, char *argv[]) {
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) { if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
const char *tty; const char *tty;
if ((tty = strrchr(active, ' '))) tty = strrchr(active, ' ');
if (tty)
tty ++; tty ++;
else else
tty = active; tty = active;
@ -104,8 +111,8 @@ int main(int argc, char *argv[]) {
log_debug("Automatically adding serial getty for /dev/%s.", tty); log_debug("Automatically adding serial getty for /dev/%s.", tty);
if (!(n = unit_name_replace_instance("serial-getty@.service", tty)) || n = unit_name_replace_instance("serial-getty@.service", tty);
add_symlink("serial-getty@.service", n) < 0) if (!n || add_symlink("serial-getty@.service", n) < 0)
r = EXIT_FAILURE; r = EXIT_FAILURE;
free(n); free(n);