Merge lp:~pitti/ubiquity/ubuntu-drivers-common into lp:ubiquity

[Martin Pitt]

As per https://blueprints.launchpad.net/ubuntu/+spec/desktop-q-third-party-driver-installation this branch switches ubiquity from Jockey (which we want to deprecate) to the new ubuntu-drivers-common package.

The main change is in scripts/simple-plugins which now calls "ubuntu-drivers autoinstall" instead of "jockey -a". The changes in ubiquity/plugins/ubi-prepare.py merely change the "is this program available" tests, and drop the now obsolete restarting of the Jockey backend. (ubuntu-drivers does not use any D-BUS mechanism)

scripts/plugininstall.py drops the "jockey -C" call. The --check-composite call is obsolete, as the free video drivers now provide 3D/compositing as well. "ubuntu-drivers autoinstall" is supposed to install all drivers which we want to automatically install already, so there is no reason to handle it in two places.

Unfortunately I cannot test this on real iron, as the current quantal daily gets a kernel oops when I select "install 3rd party drivers" and click continue (oopsing on rmmod, presumably it tries to install bcmwl-kernel-source). So I tested it in a VM and hacked ubuntu-drivers to pretend it wants to install bcmwl-kernel-source. That does happen in the live system, however it stumbles over an unrelated error:

May 29 09:04:04 ubuntu ubiquity: The following NEW packages will be installed:
May 29 09:04:04 ubuntu ubiquity: bcmwl-kernel-source dkms fakeroot
May 29 09:04:04 ubuntu ubiquity: debconf: DbDriver "config": /var/cache/debconf/config.dat is locked by another
 process: Resource temporarily unavailable
[...]
May 29 09:04:05 ubuntu ubiquity: Processing triggers for man-db ...
May 29 09:04:05 ubuntu ubiquity: /var/lib/dpkg/info/man-db.postinst: 44: /var/lib/dpkg/info/man-db.postinst:
May 29 09:04:05 ubuntu ubiquity: 3: Bad file descriptor
May 29 09:04:05 ubuntu ubiquity: dpkg: error processing man-db (--unpack):
May 29 09:04:05 ubuntu ubiquity: subprocess installed post-installation script returned error exit status 2
May 29 09:04:05 ubuntu ubiquity: No apport report written because MaxReports is reached already
May 29 09:04:05 ubuntu ubiquity: Errors were encountered while processing:
May 29 09:04:05 ubuntu ubiquity: man-db
May 29 09:04:05 ubuntu ubiquity: E: Sub-process /usr/bin/dpkg returned an error code (1)
May 29 09:04:05 ubuntu ubiquity: ubuntu-drivers autoinstall failed with code: 100

After that, bcmwl-kernel-source is installed but unconfigured; sudo dpkg --configure -a fixes that. However, bcmwl-kernel-source is not installed in the target system after ubiquity finishes; is ubiquity meant to copy the installed package from the live system, or does the plugin get called again in the /target/ chroot for a fresh install? (In that case that would use the unhacked ubuntu-drivers in /target, which of course would not pull in bcmwl for a KVM system).

[Evan (ev)]

Repeating this from IRC, so we have a record.

Debconf does not like multiple things talking to it. Since ubiquity is already talking to it, you need to do something like:

DEBCONF_DB_REPLACE=configdb DEBCONF_DB_OVERRIDE="Pipe{infd:none outfd:none}" ubuntu-drivers autoinstall

You'll also need to replicate jockey/debian/jockey.ubiquity to get the installed packages in /target. Colin mentioned that you can subclass plugin.InstallPlugin to have post-install tasks, though he also suggested that target-config hooks (like the existing Jockey one) are preferable.

Thanks for this work!

review: Needs Fixing

[lp:~pitti/ubiquity/ubuntu-drivers-common]

5495. By Martin Pitt on 2012-05-29

Run "ubuntu-drivers autoinstall" with Ubiquity friendly debconf environment

5496. By Martin Pitt on 2012-05-29

scripts/simple-plugins: Save package list, so that ubuntu-driver-common's ubiquity plugin can use it to copy the drivers to /target

[Martin Pitt (pitti)]

r5495 fixes the "3: Bad file descriptor" error. r5496 keeps the auto-installed package list around for the /target plugin.

This goes together with the latest u-d-c which I just uploaded:

ubuntu-drivers-common (1:0.2.52) quantal; urgency=low

  * ubuntu-drivers: Add --package-list option to create a file with the list
    of installed packages in "autoinstall" mode.
  * Add ubiquity/target-config/31ubuntu_driver_packages: Ubiquity plugin to
    install all packages that "ubuntu-drivers autoinstall" installed into the
    live system. Install it in setup.py.
  * ubuntu-drivers: Stop meddling with the debconf environment variables. It
    is wrong (and too late anyway for Ubiquity) to do it here. The complete
    environment setting is now done in Ubiquity's simple-plugins.

 -- Martin Pitt <email address hidden> Tue, 29 May 2012 16:00:21 +0200

With this ubiquity branch and this u-d-common version I get bcmwl-kernel-source installed cleanly in both the live system as well as the installed target.

review: Needs Resubmitting

[Evan (ev)]

Looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-28 14:37:16 +0000
+++ debian/changelog	2012-05-29 13:56:21 +0000
@@ -6,6 +6,15 @@
   [ Dmitrijs Ledkovs ]
   * Remove migration-assistant's UI definitions.
 
+  [ Martin Pitt ]
+  * scripts/simple-plugins, ubiquity/plugins/ubi-prepare.py: Move from Jockey
+    to "ubuntu-drivers autoinstall". Add ubuntu-drivers-common Recommends: for
+    this.
+  * scripts/plugininstall.py: Drop jockey --check-composite call. It is
+    obsolete as the free drivers now provide 3D support. Automatic
+    installation of graphics drivers is controlled and covered by
+    ubuntu-drivers autoinstall now.
+
  -- Dmitrijs Ledkovs <[e-mail]>  Mon, 28 May 2012 15:35:55 +0100
 
 ubiquity (2.11.3) quantal; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-05-24 10:44:21 +0000
+++ debian/control	2012-05-29 13:56:21 +0000
@@ -11,7 +11,7 @@
 Package: ubiquity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, debconf (>= 1.5.43), ubiquity-frontend-${mangled-version}, ubiquity-artwork-${mangled-version}, laptop-detect, lsb-release, ubiquity-casper, python3-apt (>= 0.7.100.3~), ${console-setup-depends}, iso-codes, passwd, adduser, os-prober, rdate, ntfs-3g (>= 1:2011.1.15AR.4+2011.4.12-1) [any-alpha any-amd64 any-i386] | ntfsprogs [any-alpha any-amd64 any-i386], ecryptfs-utils, cryptsetup, python3-pyicu (>= 1.0), reiserfsprogs, language-selector-common (>= 0.4.16), archdetect-deb, dpkg-repack, apt-clone, wget, grub-common [any-amd64 any-i386], realpath, dbus-x11, python3-six
-Recommends: grub-pc [any-amd64 any-i386] | grub [any-amd64 any-i386] | grub-efi [any-amd64 any-i386], flash-kernel [armel armhf], uboot-mkimage [armel armhf], uboot-envtools [armel armhf], redboot-tools [armel armhf], yaboot [powerpc], hfsutils [powerpc], dmraid, btrfs-tools
+Recommends: grub-pc [any-amd64 any-i386] | grub [any-amd64 any-i386] | grub-efi [any-amd64 any-i386], flash-kernel [armel armhf], uboot-mkimage [armel armhf], uboot-envtools [armel armhf], redboot-tools [armel armhf], yaboot [powerpc], hfsutils [powerpc], dmraid, btrfs-tools, ubuntu-drivers-common
 Conflicts: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot
 Replaces: ubuntu-express, espresso, espresso-utils, espresso-locale, espresso-keyboard-setup, espresso-kbd-chooser, espresso-timezone, user-setup (<< 0.05ubuntu6), partman, espresso-grub, espresso-yaboot, ubiquity-frontend-gtk (<< 2.3.8)
 Description: Ubuntu live CD installer

=== modified file 'scripts/plugininstall.py'
--- scripts/plugininstall.py	2012-05-24 10:44:21 +0000
+++ scripts/plugininstall.py	2012-05-29 13:56:21 +0000
@@ -1195,43 +1195,6 @@
             self.db.progress('INFO', 'ubiquity/install/nonfree')
             packages = self.db.get('ubiquity/nonfree_package').split()
             self.do_install(packages)
-            try:
-                install_misc.chrex(self.target,'dpkg-divert', '--package',
-                        'ubiquity', '--rename', '--quiet', '--add',
-                        '/usr/sbin/update-initramfs')
-                try:
-                    os.symlink(
-                        '/bin/true',
-                        self.target_file('usr/sbin/update-initramfs'))
-                except OSError:
-                    pass
-                env = os.environ.copy()
-                env['LC_ALL'] = 'C'
-                misc.execute('mount', '--bind', '/proc', self.target + '/proc')
-                misc.execute('mount', '--bind', '/sys', self.target + '/sys')
-                misc.execute('mount', '--bind', '/dev', self.target + '/dev')
-                inst_composite = ['chroot', self.target, 'jockey-text',
-                                  '-C', '--no-dbus', '-k', self.kernel_version]
-                p = subprocess.Popen(inst_composite, stdin=subprocess.PIPE,
-                                     stdout=sys.stderr, env=env,
-                                     universal_newlines=True)
-                p.communicate('y\n')
-            except OSError:
-                syslog.syslog(syslog.LOG_WARNING,
-                    'Could not install a composited driver:')
-                for line in traceback.format_exc().split('\n'):
-                    syslog.syslog(syslog.LOG_WARNING, line)
-            finally:
-                misc.execute('umount', '-f', self.target + '/proc')
-                misc.execute('umount', '-f', self.target + '/sys')
-                misc.execute('umount', '-f', self.target + '/dev')
-                osextras.unlink_force(
-                    self.target_file('usr/sbin/update-initramfs'))
-                install_misc.chrex(self.target,'dpkg-divert', '--package',
-                        'ubiquity', '--rename', '--quiet', '--remove',
-                        '/usr/sbin/update-initramfs')
-                install_misc.chrex(self.target,'update-initramfs', '-c', '-k',
-                        self.kernel_version)
 
     def install_extras(self):
         """Try to install additional packages requested by installer

=== modified file 'scripts/simple-plugins'
--- scripts/simple-plugins	2010-09-24 10:52:01 +0000
+++ scripts/simple-plugins	2012-05-29 13:56:21 +0000
@@ -6,8 +6,10 @@
     db_input high ubiquity/use_nonfree || true
     db_get ubiquity/use_nonfree
     if [ "$RET" = "true" ]; then
-        jockey-text -a || \
-		logger -t ubiquity "Jockey auto-install failed with code: $?"
+        env -u DEBIAN_HAS_FRONTEND -u DEBCONF_REDIR \
+            DEBCONF_DB_REPLACE=configdb DEBCONF_DB_OVERRIDE="Pipe{infd:none outfd:none}" \
+            ubuntu-drivers autoinstall --package-list /run/ubuntu-drivers.autoinstall || \
+		logger -t ubiquity "ubuntu-drivers autoinstall failed with code: $?"
     fi
 elif [ "$1" = "wireless" ]; then
     db_get ubiquity/online

=== modified file 'ubiquity/plugins/ubi-prepare.py'
--- ubiquity/plugins/ubi-prepare.py	2012-05-03 12:26:22 +0000
+++ ubiquity/plugins/ubi-prepare.py	2012-05-29 13:56:21 +0000
@@ -118,10 +118,10 @@
             self.prepare_foss_disclaimer_extra.set_property('visible', False)
 
     def set_use_nonfree(self, val):
-        if osextras.find_on_path('jockey-text'):
+        if osextras.find_on_path('ubuntu-drivers'):
             self.prepare_nonfree_software.set_active(val)
         else:
-            self.debug('Could not find jockey-text on the executable path.')
+            self.debug('Could not find ubuntu-drivers on the executable path.')
             self.set_allow_nonfree(False)
 
     def get_use_nonfree(self):
@@ -193,10 +193,10 @@
             self.prepare_foss_disclaimer.setVisible(False)
 
     def set_use_nonfree(self, val):
-        if osextras.find_on_path('jockey-text'):
+        if osextras.find_on_path('ubuntu-drivers'):
             self.prepare_nonfree_software.setChecked(val)
         else:
-            self.debug('Could not find jockey-text on the executable path.')
+            self.debug('Could not find ubuntu-drivers on the executable path.')
             self.set_allow_nonfree(False)
 
     def get_use_nonfree(self):
@@ -263,12 +263,4 @@
                 if self.db.fget('ubiquity/nonfree_package', 'seen') != 'true':
                     self.preseed('ubiquity/nonfree_package',
                         self.ui.restricted_package_name)
-                bus = dbus.SystemBus()
-                obj = bus.get_object(JOCKEY, JOCKEY_PATH)
-                i = dbus.Interface(obj, JOCKEY)
-                i.shutdown(timeout=MAX_DBUS_TIMEOUT)
-                env = os.environ.copy()
-                env['DEBCONF_DB_REPLACE'] = 'configdb'
-                env['DEBCONF_DB_OVERRIDE'] = 'Pipe{infd:none outfd:none}'
-                subprocess.Popen(['/usr/share/jockey/jockey-backend', '--timeout=120'], env=env)
         plugin.Plugin.ok_handler(self)