Merge lp:~xnox/ubiquity/fix-oem-user into lp:ubiquity

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

* dbus-launch --exit-with session leaves around defunct dbus-launch processes after exiting with session. Later userdel complains that it cannot remove user used by that process. There are no other processes by oem user left, hence using killall -u oem || true, before removing the user. I've tried tracking the pid imperically from the PID that dbus-launch prints on stdout, but that's not the pid that is left around hanging. Not sure if there are any better ways to kill that stray dbus. I guess for T-series we should look into why dbus-launch is leaving defunct process around.

[Colin Watson (cjwatson)]

I'd prefer using pkill rather than killall on general principles, but this adjustment to my change looks fine to me.

review: Approve

[lp:~xnox/ubiquity/fix-oem-user]

6028. By Dimitri John Ledkov on 2013-10-14

Use pkill instead, and depend on it

6029. By Dimitri John Ledkov on 2013-10-14

releasing package ubiquity version 2.15.24

=== modified file 'bin/oem-config-firstboot'
--- bin/oem-config-firstboot	2012-10-19 17:03:08 +0000
+++ bin/oem-config-firstboot	2013-10-14 17:19:43 +0000
@@ -70,6 +70,14 @@
 			/usr/sbin/oem-config-wrapper $DEBUG $AUTOMATIC --only || CODE=$?
 	fi
 	if [ "$CODE" -eq 0 ]; then
+		# Remove the temporary OEM configuration user, if possible
+		# and desired.
+		RET="$(echo GET oem-config/remove | debconf-communicate)"
+		if [ "${RET#* }" = true ] && getent passwd oem >/dev/null; then
+			pkill -u oem || true
+			userdel --force --remove oem || true
+			ps -axf
+		fi
 		exit 0
 	elif [ "$CODE" -eq 10 ]; then
 		cat <<EOF
@@ -119,6 +127,10 @@
 	rm -f /var/lib/oem-config/run
 	RET="$(echo GET oem-config/remove | debconf-communicate)"
 	if [ "${RET#* }" = true ]; then
+		if getent passwd oem >/dev/null; then
+			pkill -u oem || true
+			userdel --force --remove oem || true
+		fi
 		apt-get -y purge ubiquity >>/var/log/oem-config.log 2>&1
 	fi
 

=== modified file 'bin/oem-config-wrapper'
--- bin/oem-config-wrapper	2011-10-01 01:06:43 +0000
+++ bin/oem-config-wrapper	2013-10-14 17:19:43 +0000
@@ -9,11 +9,6 @@
 # Don't run again.
 rm -f /var/lib/oem-config/run
 
-# Remove the temporary OEM configuration user, if possible.
-if getent passwd oem >/dev/null; then
-	userdel --force --remove oem || true
-fi
-
 # Cleanup from anything the early command prepared
 RET="$(echo GET oem-config/late_command | debconf-communicate)" || true
 if [ "${RET%% *}" = 0 ]; then

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 14:37:36 +0000
+++ debian/changelog	2013-10-14 17:19:43 +0000
@@ -1,3 +1,16 @@
+ubiquity (2.15.24) saucy; urgency=low
+
+  [ Colin Watson ]
+  * Move oem user removal from upstart & wrapper into
+    oem-config-firstboot, after ubiquity-dm finished executing. (LP:
+    #1231166) (LP: #1239471)
+
+  [ Dmitrijs Ledkovs ]
+  * Kill any remaining oem user process before removing oem user (session
+    dbus leaves zombies). (LP: #1231166)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Mon, 14 Oct 2013 18:19:27 +0100
+
 ubiquity (2.15.23) saucy; urgency=low
 
   * Attempt to remove oem user again in the oem-config/post-start, after

=== modified file 'debian/control'
--- debian/control	2013-09-25 11:56:53 +0000
+++ debian/control	2013-10-14 17:19:43 +0000
@@ -81,7 +81,7 @@
 
 Package: oem-config
 Architecture: all
-Depends: ${misc:Depends}, ubiquity (= ${binary:Version}), oem-config-frontend-${mangled-version}
+Depends: ${misc:Depends}, ubiquity (= ${binary:Version}), oem-config-frontend-${mangled-version}, procps
 Conflicts: oem-config-keyboard, oem-config-locale, oem-config-timezone
 Replaces: oem-config-keyboard, oem-config-locale, oem-config-timezone, oem-config-gtk (<< 1.54.13), oem-config-kde (<< 1.54.13)
 Description: Perform end-user configuration after initial OEM installation

=== modified file 'debian/oem-config.oem-config.upstart'
--- debian/oem-config.oem-config.upstart	2013-10-11 09:14:15 +0000
+++ debian/oem-config.oem-config.upstart	2013-10-14 17:19:43 +0000
@@ -24,8 +24,6 @@
 task
 normal exit 0 1
 
-console output
-
 script
     [ -f /var/lib/oem-config/run ]
 
@@ -59,11 +57,3 @@
 
     exec oem-config-firstboot $debug $automatic
 end script
-
-post-start script
-# Remove the temporary OEM configuration user, again, if possible.
-# If and when oem-config-wrapper fails http://pad.lv/1231166
-if getent passwd oem >/dev/null; then
-	userdel --force --remove oem || true
-fi
-end script