Merge lp:~dgadomski/ubiquity/lp1749289 into lp:ubiquity

[Dariusz Gadomski]

Fixes a systemd freeze after cancelling debconf UI.

When using systemd and performing a oem installation using a debconf_ui
frontend there is a scenario requiring a reboot to continue (more details
at LP: #1749289).

There were several causes for this:
* bin/oem-config-firstboot - 'set -e' had to be removed, because otherwise
    the script was terminated and no exit code check was done so
    code 10 return from oem-config-wrapper was not handled in the if block.
* bin/ubiquity cancelling the installation returned a code 10,
    which then lead to performing a wizard.do_reboot(). This method
    was not implemented for the debconf frontend. This caused an exception
    and exiting the process with code 1.
    Moreover, stealing the terminal control with the termios.TIOCSCTTY
    made doing input/output in oem-config-firstboot impossible, so even
    after falling into if [ $CODE -eq 10 ] block nothing was presented
    to the user.

After fixing the above issues user is presented with 3 options: to try again,
launch a shell or reboot (as originally intended in the code).

[Colin Watson (cjwatson)]

I don't know if you manually selected me as a reviewer or if I was selected automatically. If the latter, please let me know and I'll see if I can fix that. If the former, please don't do that; I very rarely work on ubiquity any more and I won't be doing reviews of anything non-trivial.

I'll request a review from the ubuntu-installer team instead.

review: Abstain

[Dariusz Gadomski (dgadomski)]

> I'll request a review from the ubuntu-installer team instead.

Thank you for taking a look Colin.

I've picked you manually since bzr pointed you as the author of the bin/oem-config-firstboot changes that were mutually exclusive (set -e vs handling the exit code of oem-config-wrapper) so I figured that you are the best person to verify what was the expected behavior there. Sadly there were no tests for that part of the code to dispel my doubts.

[Dariusz Gadomski (dgadomski)]

> I'll request a review from the ubuntu-installer team instead.

Thank you for taking a look Colin.

I've picked you manually since bzr pointed you as the author of the bin/oem-config-firstboot changes that were mutually exclusive (set -e vs handling the exit code of oem-config-wrapper) so I figured that you are the best person to verify what was the expected behavior there. Sadly there were no tests for that part of the code to dispel my doubts.

[Dimitri John Ledkov (xnox)]

The development of ubiquity has moved to git, still hosted on launchpad. If this merge proposal is still relevant, please resubmit it against the git branches found at https://code.launchpad.net/ubiquity

Sorry for any inconvenience caused.

review: Needs Resubmitting

[Dimitri John Ledkov (xnox)]

This looks good. Can rebase this onto git trees.

review: Approve

Unmerged revisions

6596. By Dariusz Gadomski on 2018-03-15

Fixes a systemd freeze after cancelling debconf UI.

When using systemd and performing a oem installation using a debconf_ui
frontend there is a scenario requiring a reboot to continue (more details
at LP: #1749289).

There were several causes for this:
* bin/oem-config-firstboot - 'set -e' had to be removed, because otherwise
    the script was terminated and no exit code check was done so
    code 10 return from oem-config-wrapper was not handled in the if block.
* bin/ubiquity cancelling the installation returned a code 10,
    which then lead to performing a wizard.do_reboot(). This method
    was not implemented for the debconf frontend. This caused an exception
    and exiting the process with code 1.
    Moreover, stealing the terminal control with the termios.TIOCSCTTY
    made doing input/output in oem-config-firstboot impossible, so even
    after falling into if [ $CODE -eq 10 ] block nothing was presented
    to the user.

After fixing the above issues user is presented with 3 options: to try again,
launch a shell or reboot (as originally intended in the code).

=== modified file 'bin/oem-config-firstboot'
--- bin/oem-config-firstboot	2016-03-29 02:53:09 +0000
+++ bin/oem-config-firstboot	2018-03-15 11:03:49 +0000
@@ -1,6 +1,5 @@
 #! /bin/bash
 # Run oem-config on the first boot after shipping to the end user.
-set -e
 
 DEBUG=
 AUTOMATIC=

=== modified file 'bin/ubiquity'
--- bin/ubiquity	2017-07-18 15:21:41 +0000
+++ bin/ubiquity	2018-03-15 11:03:49 +0000
@@ -122,8 +122,6 @@
         if tty >= 3:
             os.close(tty)
 
-        fcntl.ioctl(0, termios.TIOCSCTTY, 1)
-
     if 'UBIQUITY_BTERM' not in os.environ:
         os.environ['UBIQUITY_BTERM'] = '1'
 
@@ -268,7 +266,9 @@
     unmount_target()
     distro = distribution().lower()
     wizard = ui.Wizard(distro)
+    exit_on_failure = False
     if os.environ['UBIQUITY_FRONTEND'] == 'debconf_ui':
+        exit_on_failure = True
         open_terminal()
         start_debconf()
     ret = wizard.run()
@@ -281,6 +281,9 @@
             traceback.print_exc()
     copy_debconf()
     unmount_target()
+
+    if ret != 0 and exit_on_failure:
+        sys.exit(ret)
     if ret == 10:
         wizard.do_reboot()
     if ret == 11: