From 68db018009d5b4435a8c900deb4ff213612c36dd Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Wed, 6 Jun 2012 14:44:30 +0200
Subject: [PATCH] Merge old and new Upstart terminal device handling into
 common/30-disable-gettys

---
 hooks/common/30-disable-gettys   | 34 +++++++++++++++--
 hooks/edgy/30-disable-gettys     | 63 +-------------------------------
 hooks/intrepid/30-disable-gettys | 63 +-------------------------------
 hooks/karmic/30-disable-gettys   | 63 +-------------------------------
 4 files changed, 34 insertions(+), 189 deletions(-)
 mode change 100755 => 120000 hooks/edgy/30-disable-gettys
 mode change 100755 => 120000 hooks/intrepid/30-disable-gettys
 mode change 100755 => 120000 hooks/karmic/30-disable-gettys

diff --git a/hooks/common/30-disable-gettys b/hooks/common/30-disable-gettys
index 1c34ce0..821c702 100755
--- a/hooks/common/30-disable-gettys
+++ b/hooks/common/30-disable-gettys
@@ -28,7 +28,22 @@ logMessage Script $0 starting
 #
 # Do the transformation.
 #
-sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
+
+# Upstart on Ubuntu newer than 8.04
+rm -f ${prefix}/etc/init/tty[!1].conf
+[ -f ${prefix}/etc/init/tty1.conf ] && {
+    sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
+    mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
+}
+# Upstart on Ubuntu 8.04 or older
+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
+}
+
+# Inittab
+[ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab
 
 
 #
@@ -36,13 +51,26 @@ sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${pre
 #
 if [ ! -z "${serial_device}" ]; then
 
-    serial_device=`basename $serial_device`
+    serial_device=`basename ${serial_device}`
 
     # Let the user know.
     logMessage "Replacing default serial device (hvc0) with ${serial_device}"
 
     # replace existing device.
-    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
+
+    # Upstart on Ubuntu newer than 8.04
+    [ -f ${prefix}/etc/init/hvc0.conf ] && {
+        mv ${prefix}/etc/init/hvc0.conf  ${prefix}/etc/init/${serial_device}.conf
+        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf
+    }
+    # Upstart on Ubuntu 8.04 or older
+    [ -f ${prefix}/etc/event.d/hvc0 ] && {
+        mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
+        sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
+    }
+
+    # Inittab
+    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
 
     # make sure that it is allowed to login.
     echo $serial_device >> ${prefix}/etc/securetty
diff --git a/hooks/edgy/30-disable-gettys b/hooks/edgy/30-disable-gettys
deleted file mode 100755
index 05e89ab..0000000
--- a/hooks/edgy/30-disable-gettys
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-#  This script comments out all virtual terminals which aren't on the
-# first console - that must remain so that 'xm console ...' works
-# correctly.
-#
-
-
-prefix=$1
-
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-#
-#  Remove the links for upstart
-#
-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?
-#
-if [ ! -z "${serial_device}" ]; then
-
-    serial_device=`basename $serial_device`
-
-    # Let the user know.
-    logMessage "Replacing default serial device (hvc0) with ${serial_device}"
-
-    # replace existing device.
-    mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
-    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
-
-
-
-    # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
diff --git a/hooks/edgy/30-disable-gettys b/hooks/edgy/30-disable-gettys
new file mode 120000
index 0000000..114c431
--- /dev/null
+++ b/hooks/edgy/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
\ No newline at end of file
diff --git a/hooks/intrepid/30-disable-gettys b/hooks/intrepid/30-disable-gettys
deleted file mode 100755
index 05e89ab..0000000
--- a/hooks/intrepid/30-disable-gettys
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-#  This script comments out all virtual terminals which aren't on the
-# first console - that must remain so that 'xm console ...' works
-# correctly.
-#
-
-
-prefix=$1
-
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-#
-#  Remove the links for upstart
-#
-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?
-#
-if [ ! -z "${serial_device}" ]; then
-
-    serial_device=`basename $serial_device`
-
-    # Let the user know.
-    logMessage "Replacing default serial device (hvc0) with ${serial_device}"
-
-    # replace existing device.
-    mv ${prefix}/etc/event.d/hvc0  ${prefix}/etc/event.d/${serial_device}
-    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
-
-
-
-    # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
diff --git a/hooks/intrepid/30-disable-gettys b/hooks/intrepid/30-disable-gettys
new file mode 120000
index 0000000..114c431
--- /dev/null
+++ b/hooks/intrepid/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
\ No newline at end of file
diff --git a/hooks/karmic/30-disable-gettys b/hooks/karmic/30-disable-gettys
deleted file mode 100755
index 28f8345..0000000
--- a/hooks/karmic/30-disable-gettys
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-#  This script comments out all virtual terminals which aren't on the
-# first console - that must remain so that 'xm console ...' works
-# correctly.
-#
-
-
-prefix=$1
-
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-#
-#  Remove the links for upstart
-#
-rm -f ${prefix}/etc/init/tty[!1].conf
-[ -f ${prefix}/etc/init/tty1.conf ] && {
-    sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf
-    mv ${prefix}/etc/init/tty1.conf  ${prefix}/etc/init/hvc0.conf
-}
-[ -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?
-#
-if [ ! -z "${serial_device}" ]; then
-
-    serial_device=`basename ${serial_device}`
-
-    # Let the user know.
-    logMessage "Replacing default serial device (tty1) with ${serial_device}"
-
-    # replace existing device.
-    mv ${prefix}/etc/init/hvc0.conf  ${prefix}/etc/init/${serial_device}.conf
-    sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf
-    [ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab
-
-
-
-    # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished
diff --git a/hooks/karmic/30-disable-gettys b/hooks/karmic/30-disable-gettys
new file mode 120000
index 0000000..114c431
--- /dev/null
+++ b/hooks/karmic/30-disable-gettys
@@ -0,0 +1 @@
+../common/30-disable-gettys
\ No newline at end of file