chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
382241e
)
getty-generator: ignore if symlinks already exist
author
Lennart Poettering
<lennart@poettering.net>
Tue, 30 Aug 2011 23:30:57 +0000
(
01:30
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 30 Aug 2011 23:30:57 +0000
(
01:30
+0200)
src/getty-generator.c
patch
|
blob
|
history
diff --git
a/src/getty-generator.c
b/src/getty-generator.c
index 7cce76fb81cefea9826fea2ed21029998b43f78c..14cceb49c880198ff0b0f50bc2ac95b154fbb8a5 100644
(file)
--- a/
src/getty-generator.c
+++ b/
src/getty-generator.c
@@
-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) {
- log_error("Failed to create symlink from %s to %s: %m", from, to);
- r = -errno;
+ r = symlink(from, to);
+ if (r < 0) {
+ 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) {
const char *tty;
if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
const char *tty;
- if ((tty = strrchr(active, ' ')))
+ tty = strrchr(active, ' ');
+ if (tty)
tty ++;
else
tty = active;
tty ++;
else
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)) ||
-
add_symlink("serial-getty@.service", n) < 0)
+ n = unit_name_replace_instance("serial-getty@.service", tty);
+
if (!n ||
add_symlink("serial-getty@.service", n) < 0)
r = EXIT_FAILURE;
free(n);
r = EXIT_FAILURE;
free(n);