From d408ead3287bae4cf55278adb8c723a990b84e66 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Wed, 21 Oct 2020 22:59:10 -0700
Subject: [PATCH] bump HEADS to latest upstream from purism

---
 Makefile                            |  2 +-
 config/config.env                   |  2 +-
 config/container/package-hashes.txt |  1 +
 config/container/packages.list      |  1 +
 config/heads/patches/usb-boot.patch | 30 ++++++++++++++---------------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index c8697dc..1678970 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 NAME := airgap
 IMAGE := local/$(NAME):latest
 TARGET := x86_64
-DEVICES := librem13v4 librem15v4
+DEVICES := librem_13v4 librem_15v4
 GIT_REF := $(shell git log -1 --format=%H config)
 GIT_AUTHOR := $(shell git log -1 --format=%an config)
 GIT_KEY := $(shell git log -1 --format=%GP config)
diff --git a/config/config.env b/config/config.env
index 7dbf15e..6f6fa40 100644
--- a/config/config.env
+++ b/config/config.env
@@ -1,2 +1,2 @@
 BUILDROOT_REF=2766f346195dec29b53bc09f6038193998ea3693
-HEADS_REF=648a75b32128bf839dd201b8331b42c0c33da39a
+HEADS_REF=e30e3bf3e540b541aa68155233ad1106c8b8631e
diff --git a/config/container/package-hashes.txt b/config/container/package-hashes.txt
index 4935469..3c9b496 100644
--- a/config/container/package-hashes.txt
+++ b/config/container/package-hashes.txt
@@ -107,6 +107,7 @@
 5c83aafe6b83f801434c5dad7bddad8a8b459a1b590ee7d344c30667d8ca1ac5  liberror-perl_0.17027-2_all.deb
 5e06dffcea8b16766498bdcbcf703e8b7e31c2d52735fa181a5f5f95db5de7ae  cmake-data_3.13.4-1_all.deb
 603f929d1ae548a8faa1f892ae93e623bde97de7ddbe4a796618c735ca7ff8b8  libicu63_63.1-6+deb10u1_amd64.deb
+619f27785060d2d942b23a897481bb5fc068c8bba7afc710e48dbf1ec410ad08  gawk_1%3a4.2.1+dfsg-1_amd64.deb
 61c00b6f4c7a242aa6aefdc07012747607cd9c6c5392c1dcd087ce27031dd1dd  perl-modules-5.28_5.28.1-6+deb10u1_all.deb
 61c7a740651a8f310a08d83a0c90a295916479588ae91f5222e429059560990e  manpages_4.16-2_all.deb
 61fc3d4e34671d05f097e4aee5c03223b66de4fcbc76887ad1dbc55885c3965b  pkg-config_0.29-6_amd64.deb
diff --git a/config/container/packages.list b/config/container/packages.list
index 732f4b5..7eed730 100644
--- a/config/container/packages.list
+++ b/config/container/packages.list
@@ -28,6 +28,7 @@ file=1:5.35-4+deb10u1
 flex=2.6.4-6.2
 g++-8=8.3.0-6
 g++=4:8.3.0-1
+gawk=1:4.2.1+dfsg-1
 gcc-8=8.3.0-6
 gcc=4:8.3.0-1
 git-man=1:2.20.1-2+deb10u3
diff --git a/config/heads/patches/usb-boot.patch b/config/heads/patches/usb-boot.patch
index 2b4935c..968665b 100644
--- a/config/heads/patches/usb-boot.patch
+++ b/config/heads/patches/usb-boot.patch
@@ -1,5 +1,5 @@
 diff --git a/initrd/bin/gui-init b/initrd/bin/gui-init
-index a7f97ab..f1562a9 100755
+index 38953ca..1740da6 100755
 --- a/initrd/bin/gui-init
 +++ b/initrd/bin/gui-init
 @@ -13,6 +13,11 @@ mount_boot()
@@ -7,15 +7,15 @@ index a7f97ab..f1562a9 100755
    # Mount local disk if it is not already mounted
    while ! grep -q /boot /proc/mounts ; do
 +
-+	if [ "$CONFIG_BOOT_USB" = "y" ]; then
-+	    enable_usb
-+	fi
++    if [ "$CONFIG_BOOT_USB" = "y" ]; then
++        enable_usb
++    fi
 +
-     # ensure default boot device is set
-     if [ ! -e "$CONFIG_BOOT_DEV" ]; then
-       if (whiptail $CONFIG_ERROR_BG_COLOR --clear --title "ERROR: $CONFIG_BOOT_DEV missing!" \
+     # try to mount if CONFIG_BOOT_DEV exists
+     if [ -e "$CONFIG_BOOT_DEV" ]; then
+       mount -o ro $CONFIG_BOOT_DEV /boot 
 diff --git a/initrd/bin/mount-usb b/initrd/bin/mount-usb
-index 266f9dd..556d66e 100755
+index 501171a..2196bbd 100755
 --- a/initrd/bin/mount-usb
 +++ b/initrd/bin/mount-usb
 @@ -4,19 +4,6 @@
@@ -39,11 +39,11 @@ index 266f9dd..556d66e 100755
    mkdir /media
  fi
 diff --git a/initrd/bin/usb-scan b/initrd/bin/usb-scan
-index a9debdf..6f10a30 100755
+index d9f26b0..330d672 100755
 --- a/initrd/bin/usb-scan
 +++ b/initrd/bin/usb-scan
-@@ -4,12 +4,6 @@ set -e -o pipefail
- . /etc/functions
+@@ -5,12 +5,6 @@ set -e -o pipefail
+ . /etc/gui_functions
  . /tmp/config
  
 -# Unmount any previous boot device
@@ -53,13 +53,13 @@ index a9debdf..6f10a30 100755
 -fi
 -
  # Mount the USB boot device
- if ! grep -q /media /proc/mounts ; then
- 	mount-usb "$CONFIG_USB_BOOT_DEV" \
+ mount_usb || die "Unable to mount /media"
+ 
 diff --git a/initrd/etc/functions b/initrd/etc/functions
-index 0c7e950..d8f4e33 100755
+index dc0fbed..00afcdb 100755
 --- a/initrd/etc/functions
 +++ b/initrd/etc/functions
-@@ -116,6 +116,18 @@ enable_usb()
+@@ -122,6 +122,18 @@ enable_usb()
  		|| die "xhci_pci: module load failed"
  		sleep 2
  	fi