[systemd-commits] 2 commits - src/99-systemd.rules.in src/getty-generator.c
Lennart Poettering
lennart at kemper.freedesktop.org
Tue Aug 30 19:24:03 PDT 2011
src/99-systemd.rules.in | 2 -
src/getty-generator.c | 78 +++++++++++++++++++++++++++++++++++-------------
2 files changed, 59 insertions(+), 21 deletions(-)
New commits:
commit 4dc380d16dfbead78de9caaf5104dbc00bac6d75
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Aug 31 04:22:41 2011 +0200
getty: simplify things a bit
https://bugs.freedesktop.org/show_bug.cgi?id=39818
diff --git a/src/getty-generator.c b/src/getty-generator.c
index 4be3ce9..d4beffa 100644
--- a/src/getty-generator.c
+++ b/src/getty-generator.c
@@ -33,6 +33,9 @@ static int add_symlink(const char *fservice, const char *tservice) {
char *from = NULL, *to = NULL;
int r;
+ assert(fservice);
+ assert(tservice);
+
asprintf(&from, SYSTEM_DATA_UNIT_PATH "/%s", fservice);
asprintf(&to, "%s/getty.target.wants/%s", arg_dest, tservice);
@@ -63,6 +66,26 @@ finish:
return r;
}
+static int add_serial_getty(const char *tty) {
+ char *n;
+ int r;
+
+ assert(tty);
+
+ log_debug("Automatically adding serial getty for /dev/%s.", tty);
+
+ n = unit_name_replace_instance("serial-getty at .service", tty);
+ if (!n) {
+ log_error("Out of memory");
+ return -ENOMEM;
+ }
+
+ r = add_symlink("serial-getty at .service", n);
+ free(n);
+
+ return r;
+}
+
int main(int argc, char *argv[]) {
static const char virtualization_consoles[] =
@@ -112,27 +135,15 @@ int main(int argc, char *argv[]) {
if (tty_is_vc(tty))
free(active);
else {
- char *n;
int k;
/* We assume that gettys on virtual terminals are
* started via manual configuration and do this magic
* only for non-VC terminals. */
- log_debug("Automatically adding serial getty for /dev/%s.", tty);
-
- n = unit_name_replace_instance("serial-getty at .service", tty);
+ k = add_serial_getty(tty);
free(active);
- if (!n) {
- log_error("Out of memory");
- r = EXIT_FAILURE;
- goto finish;
- }
-
- k = add_symlink("serial-getty at .service", n);
- free(n);
-
if (k < 0) {
r = EXIT_FAILURE;
goto finish;
@@ -143,7 +154,7 @@ int main(int argc, char *argv[]) {
/* Automatically add in a serial getty on the first
* virtualizer console */
NULSTR_FOREACH(j, virtualization_consoles) {
- char *n, *p;
+ char *p;
int k;
if (asprintf(&p, "/sys/class/tty/%s", j) < 0) {
@@ -158,18 +169,7 @@ int main(int argc, char *argv[]) {
if (k < 0)
continue;
- log_debug("Automatically adding serial getty for /dev/%s.", j);
-
- n = unit_name_replace_instance("serial-getty at .service", j);
- if (!n) {
- log_error("Out of memory");
- r = EXIT_FAILURE;
- goto finish;
- }
-
- k = add_symlink("serial-getty at .service", n);
- free(n);
-
+ k = add_serial_getty(j);
if (k < 0) {
r = EXIT_FAILURE;
goto finish;
commit 3c20189a722e6f2eec12c57c3bf3567533073c66
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Aug 31 04:15:42 2011 +0200
getty: automatically add getty on hvsi0 virtualizer console
https://bugs.freedesktop.org/show_bug.cgi?id=39818
diff --git a/src/99-systemd.rules.in b/src/99-systemd.rules.in
index a9e740e..884a614 100644
--- a/src/99-systemd.rules.in
+++ b/src/99-systemd.rules.in
@@ -8,7 +8,7 @@
ACTION=="remove", GOTO="systemd_end"
SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
-SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
KERNEL=="vport*", TAG+="systemd"
diff --git a/src/getty-generator.c b/src/getty-generator.c
index 14cceb4..4be3ce9 100644
--- a/src/getty-generator.c
+++ b/src/getty-generator.c
@@ -47,7 +47,7 @@ static int add_symlink(const char *fservice, const char *tservice) {
r = symlink(from, to);
if (r < 0) {
if (errno == EEXIST)
- /* In case console=hvc is passed this will very likely result in EEXIST */
+ /* In case console=hvc0 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);
@@ -64,23 +64,30 @@ finish:
}
int main(int argc, char *argv[]) {
+
+ static const char virtualization_consoles[] =
+ "hvc0\0"
+ "xvc0\0"
+ "hvsi0\0";
+
int r = EXIT_SUCCESS;
char *active;
+ const char *j;
if (argc > 2) {
log_error("This program takes one or no arguments.");
return EXIT_FAILURE;
}
- if (argc > 1)
- arg_dest = argv[1];
-
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
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.");
@@ -102,8 +109,11 @@ int main(int argc, char *argv[]) {
/* Automatically add in a serial getty on the kernel
* console */
- if (!tty_is_vc(tty)) {
+ if (tty_is_vc(tty))
+ free(active);
+ else {
char *n;
+ int k;
/* We assume that gettys on virtual terminals are
* started via manual configuration and do this magic
@@ -112,30 +122,58 @@ int main(int argc, char *argv[]) {
log_debug("Automatically adding serial getty for /dev/%s.", tty);
n = unit_name_replace_instance("serial-getty at .service", tty);
- if (!n || add_symlink("serial-getty at .service", n) < 0)
+ free(active);
+
+ if (!n) {
+ log_error("Out of memory");
r = EXIT_FAILURE;
+ goto finish;
+ }
+ k = add_symlink("serial-getty at .service", n);
free(n);
- }
- free(active);
+ if (k < 0) {
+ r = EXIT_FAILURE;
+ goto finish;
+ }
+ }
}
/* Automatically add in a serial getty on the first
* virtualizer console */
- if (access("/sys/class/tty/hvc0", F_OK) == 0) {
- log_debug("Automatically adding serial getty for hvc0.");
+ NULSTR_FOREACH(j, virtualization_consoles) {
+ char *n, *p;
+ int k;
- if (add_symlink("serial-getty at .service", "serial-getty at hvc0.service") < 0)
+ if (asprintf(&p, "/sys/class/tty/%s", j) < 0) {
+ log_error("Out of memory");
r = EXIT_FAILURE;
+ goto finish;
+ }
- }
+ k = access(p, F_OK);
+ free(p);
+
+ if (k < 0)
+ continue;
- if (access("/sys/class/tty/xvc0", F_OK) == 0) {
- log_debug("Automatically adding serial getty for xvc0.");
+ log_debug("Automatically adding serial getty for /dev/%s.", j);
- if (add_symlink("serial-getty at .service", "serial-getty at xvc0.service") < 0)
+ n = unit_name_replace_instance("serial-getty at .service", j);
+ if (!n) {
+ log_error("Out of memory");
r = EXIT_FAILURE;
+ goto finish;
+ }
+
+ k = add_symlink("serial-getty at .service", n);
+ free(n);
+
+ if (k < 0) {
+ r = EXIT_FAILURE;
+ goto finish;
+ }
}
finish:
More information about the systemd-commits
mailing list