aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-12-09 16:12:26 -0500
committerBill Nottingham <notting@redhat.com>2009-12-09 16:12:26 -0500
commit12dcbfe79bbc89b23f775bfd847eb53ec17b2971 (patch)
treede4e95b14ec6c0eb0b22450e70861e8c953cfeee /src
parent307e970174f12e4a808684151f132df1677c3999 (diff)
parent5df584569b80bb8977f181e16b0de47fb4df08f1 (diff)
downloadinitscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.gz
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.bz2
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.tar.xz
initscripts-12dcbfe79bbc89b23f775bfd847eb53ec17b2971.zip
Merge branch 'upstart-0.6.0-branch'
Diffstat (limited to 'src')
-rw-r--r--src/console_check.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/console_check.c b/src/console_check.c
index 595012ff..35065479 100644
--- a/src/console_check.c
+++ b/src/console_check.c
@@ -152,9 +152,10 @@ out:
int emit_console_event(char *dev, int speed) {
char *args[] = { "initctl", "emit", "--no-wait", "fedora.serial-console-available", NULL, NULL, NULL };
- args[4] = dev;
+ if (dev)
+ asprintf(&args[4],"DEV=%s",dev);
if (speed)
- asprintf(&args[5],"%d",speed);
+ asprintf(&args[5],"SPEED=%d",speed);
execv("/sbin/initctl", args);
return 1;
}