Merge lp:~jibel/ubiquity/lp1765651_OEM_touch_gnome-initial-setup_flag into lp:ubiquity

[Jean-Baptiste Lallement]

Do not start gnome-initial-setup for the OEM user (LP: #1765651)

touch /home/oem/.config/gnome-initial-setup-done to prevent gnome-initial-setup from starting in OEM preparation mode.

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-23 08:19:23 +0000
+++ debian/changelog	2018-04-23 09:19:19 +0000
@@ -14,6 +14,9 @@
   * Automatic update of included source packages: localechooser
     2.71ubuntu2.
 
+  [ Jean-Baptiste Lallement ]
+  * Do not start gnome-initial-setup for the OEM user (LP: #1765651)
+
  -- Colin Watson <[e-mail]>  Sun, 22 Apr 2018 11:20:16 +0100
 
 ubiquity (18.04.9) bionic; urgency=medium

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2018-04-20 21:11:32 +0000
+++ scripts/plugininstall.py	2018-04-23 09:19:19 +0000
@@ -1225,6 +1225,16 @@
                                 'metadata::trusted', 'true')
                             break
 
+                    # Disable gnome-initial-setup for the OEM user
+                    install_misc.chrex(
+                        self.target, 'install', '-d',
+                        '-o', 'oem', '-g', 'oem',
+                        '/home/oem/.config')
+                    install_misc.chrex(
+                        self.target,
+                        'sudo', '-i', '-u', 'oem',
+                        'touch', '/home/oem/.config/gnome-initial-setup-done')
+
                 # Carry the locale setting over to the installed system.
                 # This mimics the behavior in 01oem-config-udeb.
                 di_locale = self.db.get('debian-installer/locale')