From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Oct 2009 10:26:03 +0000 (+0200)
Subject: Fix upstart problem with serial console.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bebf0eff9a65e0c91ce2a3022e5f735ae3912ef;p=ipfire-3.x.git

Fix upstart problem with serial console.
---

diff --git a/src/initscripts/core/serial.conf b/src/initscripts/core/serial.conf
index da1bd7e5b..e06d3dbb6 100644
--- 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 f03cd9019..740f2a8de 100644
--- 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;
 }