On Fri, 2015-07-31 at 08:28 +0100, Ian Campbell wrote:
> Unless someone has an alternative suggestion I think I'll make the
> flash-kernel initramfs-hook gate its waiting for Ctrl-C on failure
> behaviour on either DEBIAN_FRONTEND or DEBIAN_HAS_FRONTEND being non
> -empty. Today the DEBIAN_FRONTEND check is explicitly for
> "noninteractive" which omits at least "passthrough" as another
> problematic case. It seems to me that few of the other possible options
> would benefit from being made to wait here (graphical ones surely not,
> likewise newt, maybe text would be ok, but lets not bother special
> casing it).

I've just pushed this change to flash-kenrel.git, so it will be in the
next upload.

commit 6cfc6f13261e2fe02fd1a54a02ca37ee132166b4
Author: Ian Campbell <i...@debian.org>
Date:   Fri Jul 31 08:24:03 2015 +0100

    Avoid waiting for Ctrl-C if any debconf frontend is in use
    
    not just non-interactive.

diff --git a/debian/changelog b/debian/changelog
index 7c2835a..bf87bd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ flash-kernel (3.48) UNRELEASED; urgency=medium
   * Update wandboard and cubox-i boot scripts to improve distro_bootcmd
     support.
 
+  [ Ian Campbell ]
+  * Avoid waiting for Ctrl-C if any debconf frontend is in use, not just
+    non-interactive. (Closes: #791794)
+
  -- Vagrant Cascadian <vagr...@debian.org>  Wed, 04 Nov 2015 13:33:08 -0800
 
 flash-kernel (3.47) unstable; urgency=medium
diff --git a/initramfs-tools/hooks/flash_kernel_set_root 
b/initramfs-tools/hooks/flash_kernel_set_root
index 201b7bd..af948c3 100755
--- a/initramfs-tools/hooks/flash_kernel_set_root
+++ b/initramfs-tools/hooks/flash_kernel_set_root
@@ -34,7 +34,7 @@ pause_error() {
        # If debconf appears to be running then it is important that
        # we do not block on stdin since this would hang the
        # installer.
-       if [ "$DEBIAN_HAS_FRONTEND" ] || [ "$DEBIAN_FRONTEND" = 
"noninteractive" ]; then
+       if [ "$DEBIAN_HAS_FRONTEND" ] || [ "$DEBIAN_FRONTEND" ]; then
                echo "Unable to abort; system will probably be broken!" >&2
        else
                echo "Press Ctrl-C to abort build, or Enter to continue" >&2

Reply via email to