From c6fc173ecc6bc2a69e44fed13cd3fc2a8b7789c9 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 9 Mar 2010 21:28:03 +0100
Subject: Debugging for upstart ...

---
 initramfs/distro-specs/ubuntu/functions-default | 12 ++++++++++--
 initramfs/stage3-stuff/init                     |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index ccc02288..f9d7b113 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -29,6 +29,13 @@ D_DIRINDXS="/var/run/sysconfig/tmp /var/lib/nobody /var/lib/misc /var/lib/pam \
 /var/lib/bluetooth /var/lib/texmf /var/lib/nfs/sm /var/lib/acpi_support \
 /var/spool/cron /var/lib/alsa"
 
+# distro specific stuff to initialize
+postinit () {
+  if [ $DEBUGLEVEL -gt 2 ]; then
+    export DEBUG_UPSTART=" -v --debug"
+  fi
+}
+
 # distro specific function called from servconfig script
 config_distro () {
   # runlevel system changed significantly compared to pre 9.10 sys-v-init
@@ -38,8 +45,9 @@ config_distro () {
   done
   # remove unneeded init scripts (stuff handled in stage3 which would
   # interface with already existing setup)
-  for file in bridge-network-interface.conf hostname.conf network*conf ;
-    do rm /mnt/init/${file} >/dev/null 2>&1
+  for file in bridge-network-interface.conf hostname.conf network-manager.conf \
+              ureadahead*conf ;
+    do rm /mnt/etc/init/${file} >/dev/null 2>&1
   done
 
   # add the halt link to the 0 and 6 runlevel directories and other useful
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 763f95cf..40816192 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -1024,4 +1024,5 @@ unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \
 runinithook '99-handing-over'
 
 # new style of pivoting (switch_root or run-init)
-exec /sbin/switch_root -c dev/console /mnt /sbin/init || error "$init_runinit"
+exec /sbin/switch_root -c dev/console /mnt /sbin/init $DEBUG_UPSTART || \
+  error "$init_runinit"
-- 
cgit v1.2.3-55-g7522