Fix upstart problem with serial console.

diff --git a/src/initscripts/core/serial.conf b/src/initscripts/core/serial.conf
index da1bd7e5b170a2b4786df1f2c720581c884879e8..e06d3dbb67a8e1aa2d92524cf654d7a9b83a63dc 100644 (file)
--- a/src/initscripts/core/serial.conf
+++ b/src/initscripts/core/serial.conf
@@ -18,7 +18,7 @@ start on serial-console-available *
 stop on starting shutdown or starting reboot
 
 pre-start script
-       /sbin/securetty $1
+       /sbin/securetty $DEV
 end script
 
-exec /sbin/agetty /dev/$1 $2 vt100-nav
+exec /sbin/agetty /dev/$DEV $SPEED vt100-nav

diff --git a/src/initscripts/src/console_check.c b/src/initscripts/src/console_check.c
index f03cd90192b1813dd190154b9121e20ed5489633..740f2a8de1e5f7fd91039c2d589edf41012db7f1 100644 (file)
--- a/src/initscripts/src/console_check.c
+++ b/src/initscripts/src/console_check.c
@@ -152,9 +152,9 @@ out:
 int emit_console_event(char *dev, int speed) {
        char *args[] = { "initctl", "emit", "--no-wait", "serial-console-available", NULL, NULL, NULL };
 
-       args[4] = 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;
 }