Merge lp:~pitti/ubiquity/systemd into lp:ubiquity

[Martin Pitt]

Port to systemd. For ubiquity-dm I factorized the script as almost all of it is re-usable. For oem-config.service I replicated the necessary shell logic as most of upstart's one can be replaced with systemd directives like Condition=*.

I tested this on today's live image, with upgrading to udisks2 2.1.4-1git3 (for bug 1410851), otherwise ubiquity can't start. I used "init=/bin/systemd
break=casper-bottom" in gfxboot to inject my locally built ubiquity debs and
ensured that in ubiquity-only mode ubiquity-dm comes up properly. I did a full test install, and aside from having to work around bug 1408495 the install went fine.

I also tested oem-config by installing systemd-sysv and the local oem-config
debs, rebooted, ran oem-config-prepare, and ran through it.

I didn't test oem-config-debconf, as I currently don't know how. Ubuntu, Kubuntu etc. don't have alternates any more, server's OEM mode doesn't work (just filed bug 1411124), and Mythbuntu etc. don't have vivid images. I tried to install oem-config on a server install, but that brings in tons of desktop/graphical packages, thus I believe that oem-config isn't actually meant for text mode, and that the debconf frontend is just for preseeding?

However, I believe it's not necessary to port oem-config-debconf.upstart; oem-config.service ensures it's running after plymouth but before lightdm or other display managers, so it should start fine.

[Dimitri John Ledkov (xnox)]

Doesn't ubiquity job need "SuccessExitStatus=1" -> to port "normal exit 0 1" from upstart?

oem-config/ubiquity is a pain to install direct - as usually the wrong type of frontend is pulled in. To try server oem-config (which should work) could you attempt something like:
$ sudo apt-get install ubiquity-frontend-debconf oem-config-debconf oem-config

We had server oem-config bugs before and i thought we fixed them up for trusty srus or some such. Let me look at the bug you filed.

[Martin Pitt (pitti)]

> Doesn't ubiquity job need "SuccessExitStatus=1

I wouldn't like to do that. The cases are either when the script has a bug, or if the "something more serious has happened, e.g. debconf locked?!" case is reached; in both cases I think it's desirable to call the unit "failed" and not paper over such things.

> To try server oem-config (which should work)

Ah, thanks, that seems to pull in a reasonable set of packages. I did that plus create an "oem" user, ran sudo oem-config-prepare, and now get the debconf stuff. I'll test that with systemd.

[Martin Pitt (pitti)]

I tested oem-config text mode: Under upstart I do see the initial debconf screen, but the keyboard is completely dead. Perhaps because the job is running on its own private PTY? Under systemd, oem-config runs noninteractively due to a lot of "Inappropriate ioctl for device" and purges itself, but of you don't see anything because there's no PTY at all.

So the text mode debconf has to get wired in differently; presumably there are a few TTY* options missing, otherwise it won't get a terminal at all.

[Martin Pitt (pitti)]

I adjusted the unit now to grab and use a proper TTY, and stop the getty. This now works well, I went through all the dialogs, verified that my user got created, the locale changed, openssh installed, and oem-config got purged. Another reboot after that also worked as expected.

=== modified file 'd-i/update-control'
--- d-i/update-control	2014-04-01 17:52:52 +0000
+++ d-i/update-control	2015-01-15 11:01:05 +0000
@@ -36,6 +36,7 @@
     'debhelper (>= 9)',
     'dh-autoreconf',
     'dh-di (>= 3)',
+    'dh-systemd',
     'dpkg-dev (>= 1.14.4)',
     'gir1.2-soup-2.4',
     'gir1.2-timezonemap-1.0',

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-07 09:52:06 +0000
+++ debian/changelog	2015-01-15 11:01:05 +0000
@@ -1,3 +1,15 @@
+ubiquity (2.21.4) UNRELEASED; urgency=medium
+
+  * Factorize ubiquity-dm startup logic out of
+    debian/ubiquity.ubiquity.upstart into scripts/start-ubiquity-dm; don't
+    call initctl emit when running under systemd.
+  * Add systemd unit for ubiquity-dm.
+  * start-ubiquity-dm: Make setterm failures non-fatal; under systemd
+    services don't run under a PTY.
+  * Add systemd unit for oem-config.
+
+ -- Martin Pitt <[e-mail]>  Wed, 14 Jan 2015 13:44:28 +0100
+
 ubiquity (2.21.3) vivid; urgency=medium
 
   [ Martin Wimpress ]

=== modified file 'debian/control'
--- debian/control	2014-11-12 14:34:35 +0000
+++ debian/control	2015-01-15 11:01:05 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest

=== added file 'debian/oem-config.oem-config.service'
--- debian/oem-config.oem-config.service	1970-01-01 00:00:00 +0000
+++ debian/oem-config.oem-config.service	2015-01-15 11:01:05 +0000
@@ -0,0 +1,36 @@
+[Unit]
+Description=End-user configuration after initial OEM installation
+Before=display-manager.service
+After=plymouth-quit.service
+Conflicts=[e-mail]
+ConditionFileIsExecutable=/usr/sbin/oem-config-firstboot
+ConditionPathExists=/var/lib/oem-config/run
+ConditionPathExists=/dev/tty1
+
+# We never want to run the oem-config job in the live environment (as is the
+# case in some custom configurations) or in recovery mode.
+ConditionKernelCommandLine=!boot=casper
+ConditionKernelCommandLine=!single
+ConditionKernelCommandLine=!rescue
+ConditionKernelCommandLine=!emergency
+
+[Service]
+Type=oneshot
+StandardInput=tty
+StandardOutput=tty
+StandardError=tty
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+ExecStart=/bin/sh -ec '\
+    for x in $(cat /proc/cmdline); do				\
+	case $x in						\
+	    debug-oem-config) debug=--debug ;;			\
+	    ubiquity/frontend=*) export frontend="${x#*=}" ;;	\
+	    automatic-oem-config) automatic=--automatic ;;	\
+	esac;							\
+    done;							\
+    exec oem-config-firstboot $debug $automatic'
+
+[Install]
+WantedBy=multi-user.target

=== modified file 'debian/rules'
--- debian/rules	2014-04-09 21:34:01 +0000
+++ debian/rules	2015-01-15 11:01:05 +0000
@@ -235,6 +235,7 @@
 	dh_installdocs
 	dh_installdebconf
 	# oem-config
+	dh_systemd_enable --name=oem-config
 	dh_installinit -n --name=oem-config
 	dh_installinit -n --name=oem-config-debconf
 	dh_installman
@@ -278,6 +279,7 @@
 	grep-dctrl -v -FTemplate base-installer/ d-i/templates \
 		>> debian/ubiquity/DEBIAN/templates
 	# ubiquity
+	dh_systemd_enable --name=ubiquity
 	dh_installinit --no-start --name=ubiquity
 	dh_installman
 	dh_lintian

=== added file 'debian/ubiquity.ubiquity.service'
--- debian/ubiquity.ubiquity.service	1970-01-01 00:00:00 +0000
+++ debian/ubiquity.ubiquity.service	2015-01-15 11:01:05 +0000
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ubuntu live CD installer
+Before=display-manager.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/ubiquity/start-ubiquity-dm
+
+[Install]
+WantedBy=graphical.target

=== modified file 'debian/ubiquity.ubiquity.upstart'
--- debian/ubiquity.ubiquity.upstart	2014-10-06 14:48:06 +0000
+++ debian/ubiquity.ubiquity.upstart	2015-01-15 11:01:05 +0000
@@ -24,78 +24,4 @@
 
 emits starting-dm
 
-script
-    test -x /usr/bin/ubiquity-dm || exit 0
-
-    ubiquity=
-    automatic=
-    debug=
-    ldtp=
-    noninteractive=
-    choose=
-    frontend=
-    for x in $(cat /proc/cmdline); do
-	case $x in
-	    debug-ubiquity)
-		debug="-d"
-		ubiquity=1
-		;;
-	    automatic-ubiquity)
-		automatic="--automatic"
-		ubiquity=1
-		;;
-	    maybe-ubiquity)
-		ubiquity=1
-		choose="--greeter"
-		;;
-	    ldtp-ubiquity)
-		ubiquity=1
-		ldtp="--ldtp"
-		;;
-	    only-ubiquity)
-		ubiquity=1
-		;;
-	    noninteractive)
-		ubiquity=1
-		noninteractive=1
-		;;
-	    ubiquity/frontend=*)
-		frontend="${x#*=}"
-		;;
-	esac
-    done
-    [ "$ubiquity" ]
-
-    if [ -r /etc/default/locale ]; then
-        . /etc/default/locale
-        if [ -n "$LANG" ]; then
-            export LANG
-        fi
-        if [ -n "$LANGUAGE" ]; then
-            export LANGUAGE
-        fi
-    fi
-
-    initctl emit starting-dm DM=ubiquity-dm
-
-    # turn off console blanking for install process
-    setterm -blank 0 > /dev/console
-
-    if [ -n "$noninteractive" ]; then
-	plymouth quit || :
-	exec ubiquity noninteractive $debug
-    else
-	if ! ubiquity-dm vt7 :0 ubuntu /usr/bin/ubiquity $debug $automatic $choose $ldtp --only $frontend; then
-	    # has X crashed, or has ubiquity?
-            if [ "$automatic" ] && ! [ -f /var/log/installer/version ]; then
-                # in case we crashed before the X startup sequence
-                plymouth quit || :
-                exec ubiquity noninteractive $debug
-            else
-                # something more serious has happened, e.g. debconf locked?!
-                exit 1
-            fi
-	fi
-    fi
-    exit 0
-end script
+exec /usr/share/ubiquity/start-ubiquity-dm

=== added file 'scripts/start-ubiquity-dm'
--- scripts/start-ubiquity-dm	1970-01-01 00:00:00 +0000
+++ scripts/start-ubiquity-dm	2015-01-15 11:01:05 +0000
@@ -0,0 +1,77 @@
+#!/bin/sh
+# startup logic of ubiquity-dm, shared between upstart job and systemd unit
+
+set -e
+test -x /usr/bin/ubiquity-dm || exit 0
+
+ubiquity=
+automatic=
+debug=
+ldtp=
+noninteractive=
+choose=
+frontend=
+for x in $(cat /proc/cmdline); do
+    case $x in
+	debug-ubiquity)
+	    debug="-d"
+	    ubiquity=1
+	    ;;
+	automatic-ubiquity)
+	    automatic="--automatic"
+	    ubiquity=1
+	    ;;
+	maybe-ubiquity)
+	    ubiquity=1
+	    choose="--greeter"
+	    ;;
+	ldtp-ubiquity)
+	    ubiquity=1
+	    ldtp="--ldtp"
+	    ;;
+	only-ubiquity)
+	    ubiquity=1
+	    ;;
+	noninteractive)
+	    ubiquity=1
+	    noninteractive=1
+	    ;;
+	ubiquity/frontend=*)
+	    frontend="${x#*=}"
+	    ;;
+    esac
+done
+[ "$ubiquity" ] || exit 0
+
+if [ -r /etc/default/locale ]; then
+    . /etc/default/locale
+    if [ -n "$LANG" ]; then
+	export LANG
+    fi
+    if [ -n "$LANGUAGE" ]; then
+	export LANGUAGE
+    fi
+fi
+
+[ -e /run/systemd/system ] || initctl emit starting-dm DM=ubiquity-dm
+
+# turn off console blanking for install process
+setterm -blank 0 > /dev/console || true
+
+if [ -n "$noninteractive" ]; then
+    plymouth quit || :
+    exec ubiquity noninteractive $debug
+else
+    if ! ubiquity-dm vt7 :0 ubuntu /usr/bin/ubiquity $debug $automatic $choose $ldtp --only $frontend; then
+	# has X crashed, or has ubiquity?
+	if [ "$automatic" ] && ! [ -f /var/log/installer/version ]; then
+	    # in case we crashed before the X startup sequence
+	    plymouth quit || :
+	    exec ubiquity noninteractive $debug
+	else
+	    # something more serious has happened, e.g. debconf locked?!
+	    exit 1
+	fi
+    fi
+fi
+exit 0