diff -Nru apport-2.20.9/apport/hookutils.py apport-2.20.9/apport/hookutils.py
--- apport-2.20.9/apport/hookutils.py	2019-11-11 21:57:56.000000000 +0000
+++ apport-2.20.9/apport/hookutils.py	2020-08-06 00:56:32.000000000 +0000
@@ -393,8 +393,11 @@
 def _root_command_prefix():
     if os.getuid() == 0:
         return []
-    else:
+    elif os.path.exists('/usr/bin/pkexec'):
         return ['pkexec']
+    # the package hook won't have everything it wanted but that's okay
+    else:
+        return []
 
 
 def root_command_output(command, input=None, stderr=subprocess.STDOUT, decode_utf8=True):
diff -Nru apport-2.20.9/debian/apport.links apport-2.20.9/debian/apport.links
--- apport-2.20.9/debian/apport.links	2020-02-11 00:46:33.000000000 +0000
+++ apport-2.20.9/debian/apport.links	2020-08-06 01:08:25.000000000 +0000
@@ -6,6 +6,7 @@
 /usr/share/apport/package-hooks/source_linux.py /usr/share/apport/package-hooks/source_linux-signed-oem-osp1.py
 /usr/share/apport/package-hooks/source_linux.py /usr/share/apport/package-hooks/source_linux-signed-oem.py
 /usr/share/apport/package-hooks/source_linux.py /usr/share/apport/package-hooks/source_linux-signed.py
+/usr/share/apport/package-hooks/source_linux.py /usr/share/apport/package-hooks/source_linux-firmware.py
 /usr/bin/apport-bug /usr/bin/ubuntu-bug
 /usr/share/man/man1/apport-bug.1.gz /usr/share/man/man1/ubuntu-bug.1.gz
 /usr/share/man/man1/apport-bug.1.gz /usr/share/man/man1/apport-collect.1.gz
diff -Nru apport-2.20.9/debian/changelog apport-2.20.9/debian/changelog
--- apport-2.20.9/debian/changelog	2020-07-24 13:08:40.000000000 +0000
+++ apport-2.20.9/debian/changelog	2020-08-06 01:08:39.000000000 +0000
@@ -1,3 +1,16 @@
+apport (2.20.9-0ubuntu7.17) bionic; urgency=medium
+
+  [ Brian Murray ]
+  * apport/hookutils.py: workaround the fact that pkexec does not work in
+    non-graphical environments yet (LP #1821415) by skipping the gathering of
+    information as root because it isn't strictly necessary for a bug report.
+    (LP: #1861451)
+
+  [ Matthieu Clemenceau ]
+  * Add in a source package hook symlink for linux-firmware. (LP: #1872059)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 05 Aug 2020 18:08:39 -0700
+
 apport (2.20.9-0ubuntu7.16) bionic-security; urgency=medium
 
   * SECURITY UPDATE: information disclosure issue (LP: #1885633)