From 494aedab67433ba8256f26bf73debc95b983d429 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 4 Jun 2012 18:47:11 +0200
Subject: [PATCH] Merge bugfixes made to intrepid/30-disable-gettys also into
 edgy/30-disable-gettys

---
 hooks/edgy/30-disable-gettys | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hooks/edgy/30-disable-gettys b/hooks/edgy/30-disable-gettys
index 5590785..1acb076 100755
--- a/hooks/edgy/30-disable-gettys
+++ b/hooks/edgy/30-disable-gettys
@@ -27,10 +27,12 @@ logMessage Script $0 starting
 #
 #  Remove the links for upstart
 #
-rm ${prefix}/etc/event.d/tty[!1]
-sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
-mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
-[ -f ${prefix}/etc/inittab ] && sed -i -e s/tty1/hvc0/ ${prefix}/etc/inittab
+rm -f ${prefix}/etc/event.d/tty[!1]
+[ -f ${prefix}/etc/event.d/tty1 ] && {
+    sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1
+    mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0
+}
+[ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 #
 #  Are we using an alternative serial device?