=== modified file 'debian/changelog'
--- debian/changelog	2011-04-27 17:18:55 +0000
+++ debian/changelog	2011-05-02 18:04:38 +0000
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.6.2a-0ubuntu5.2) natty-proposed; urgency=low
+
+  [ James Hunt ]
+  * Updated gdm.conf to fix gdm in single user mode (LP: #436936)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 02 May 2011 14:00:03 -0400
+
 kdebase-workspace (4:4.6.2a-0ubuntu5.1) natty-proposed; urgency=low
 
   * Add kubuntu_123_effectframe_glflush.diff from upstream to fix desktop

=== modified file 'debian/kdm.upstart'
--- debian/kdm.upstart	2011-03-19 10:42:51 +0000
+++ debian/kdm.upstart	2011-05-02 17:58:06 +0000
@@ -6,10 +6,14 @@
 description     "K Display Manager"
 author          "Richard Johnson"  
 
-start on (filesystem
-          and started dbus
-          and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
-               or stopped udev-fallback-graphics))
+start on ((filesystem
+            and (runlevel [!06]
+            and (started dbus
+            and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
+            or  (graphics-device-added PRIMARY_DEVICE_FOR_DISPLAY=1
+            or   stopped udev-fallback-graphics)))))
+            or  runlevel PREVLEVEL=S)
+
 stop on runlevel [016]
 
 emits login-session-start
@@ -22,16 +26,12 @@
     then
 	[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/bin/kdm" ] || { stop; exit 0; }
 
-	# Check kernel command-line for inhibitors
-	for ARG in $(cat /proc/cmdline)
-	do
-	    case "${ARG}" in
-		text|-s|s|S|single)
-                    plymouth quit || :  # We have the ball here
-		    exit 0
-		    ;;
-	    esac
-	done
+        if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
+        then
+            # Single-user mode
+            plymouth quit || :
+            exit 0
+        fi
     fi
 
     if [ -r /etc/default/locale ]; then