[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e950f7c7a39d82a620d414617e43926441ceace7 - IPFire-SCM

1 Aug 2021

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  e950f7c7a39d82a620d414617e43926441ceace7 (commit)
       via  b8b36e969c28375a5274979a7a138d4ff7535046 (commit)
       via  dd730a395bd5f2b5becd6d56cdd998e395a19a33 (commit)
       via  1e848ad3d45814977f950aeabfbeb7b32bc8d196 (commit)
       via  ff1953f7ad03796c3abf05ee1f293ae019b78ac7 (commit)
      from  255273a36bca887f153701fc204186ba9f245ec6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e950f7c7a39d82a620d414617e43926441ceace7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Wed Jul 28 11:09:18 2021 +0000
cups: Bump package version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b8b36e969c28375a5274979a7a138d4ff7535046
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 27 10:07:10 2021 +0000
grub cloud: Add kernel release to boot ID
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dd730a395bd5f2b5becd6d56cdd998e395a19a33
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 27 10:07:09 2021 +0000
flash-image: Enable GRUB_FIRST_BOOT setting
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1e848ad3d45814977f950aeabfbeb7b32bc8d196
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 27 10:07:08 2021 +0000
grub: Add file with cloud helping stuff
This file will detect whether to do certain actions depending on the
    environment it is running on.
Currently this detects whether IPFire is booting up on AWS EC2 and
    selects the serial console boot entry.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ff1953f7ad03796c3abf05ee1f293ae019b78ac7
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Tue Jul 27 10:07:07 2021 +0000
flash-images: Label serial console option as "serial"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/flash-images/grub/11_linux_scon |  2 +-
 config/grub2/00_cloud                  | 30 ++++++++++++++++++++++++++++++
 config/rootfiles/common/aarch64/grub   |  1 +
 config/rootfiles/common/i586/grub      |  1 +
 config/rootfiles/common/x86_64/grub    |  1 +
 lfs/cups                               |  2 +-
 lfs/flash-images                       |  3 ++-
 lfs/grub                               |  4 ++++
 8 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 config/grub2/00_cloud
Difference in files:

diff --git a/config/flash-images/grub/11_linux_scon b/config/flash-images/grub/11_linux_scon
index df623f470..68f554386 100755
--- a/config/flash-images/grub/11_linux_scon
+++ b/config/flash-images/grub/11_linux_scon
@@ -227,7 +227,7 @@ while [ "x$list" != "x" ] ; do
   fi
if [ "x$is_first_entry" = xtrue ]; then
-    linux_entry "Serial Console: ${OS}" "${version}" simple \
+    linux_entry "Serial Console: ${OS}" "${version}" serial \
     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyS0,115200n8"
submenu_indentation="\t"
diff --git a/config/grub2/00_cloud b/config/grub2/00_cloud
new file mode 100644
index 000000000..121cb2fbd
--- /dev/null
+++ b/config/grub2/00_cloud
@@ -0,0 +1,30 @@
+#!/bin/sh
+# This is an IPFire helper script for GRUB to enable the serial console
+# on AWS instances at the time of the first boost
+
+set -e
+
+# Do nothing if first boot isn't enabled
+if [ "${GRUB_FIRST_BOOT}" != "true" ]; then
+	exit 0
+fi
+
+. "${pkgdatadir}/grub-mkconfig_lib"
+
+if [ -z "${KERNEL_RELEASE}" ]; then
+	KERNEL_RELEASE="$(uname -r)"
+fi
+
+if [ -z "${boot_device_id}" ]; then
+	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
+fi
+
+cat <<EOF
+# Read the system manufacturer string from the BIOS
+smbios --type 1 --get-string 4 --set system_manufacturer
+
+# Are we on Amazon EC2?
+if [ "$system_manufacturer" = "Amazon EC2" ]; then
+	next_entry=gnulinux-${KERNEL_RELEASE}-serial-${boot_device_id}
+fi
+EOF
diff --git a/config/rootfiles/common/aarch64/grub b/config/rootfiles/common/aarch64/grub
index 2c8951249..ae6bdfec3 100644
--- a/config/rootfiles/common/aarch64/grub
+++ b/config/rootfiles/common/aarch64/grub
@@ -4,6 +4,7 @@ boot/grub/splash.png
 #etc/bash_completion.d/grub
 etc/default/grub
 #etc/grub.d
+etc/grub.d/00_cloud
 etc/grub.d/00_header
 etc/grub.d/10_linux
 etc/grub.d/20_linux_xen
diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub
index 72884a234..74e646150 100644
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@ -5,6 +5,7 @@ boot/grub/splash.png
 #etc/bash_completion.d/grub
 etc/default/grub
 #etc/grub.d
+etc/grub.d/00_cloud
 etc/grub.d/00_header
 etc/grub.d/10_linux
 etc/grub.d/20_linux_xen
diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub
index 8cddfcff9..5450499e3 100644
--- a/config/rootfiles/common/x86_64/grub
+++ b/config/rootfiles/common/x86_64/grub
@@ -5,6 +5,7 @@ boot/grub/splash.png
 #etc/bash_completion.d/grub
 etc/default/grub
 #etc/grub.d
+etc/grub.d/00_cloud
 etc/grub.d/00_header
 etc/grub.d/10_linux
 etc/grub.d/20_linux_xen
diff --git a/lfs/cups b/lfs/cups
index e16fcda6d..99c9c8887 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
-PAK_VER    = 22
+PAK_VER    = 23
DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
diff --git a/lfs/flash-images b/lfs/flash-images
index 72e635073..cdd0fbf7e 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -188,7 +188,8 @@ ifeq "$(BOOTLOADER)" "grub"
# Create configuration
    mkdir -pv $(MNThdd)/boot/grub
-	chroot $(MNThdd) grub-mkconfig -o /boot/grub/grub.cfg
+	GRUB_FIRST_BOOT=true KERNEL_RELEASE="$(KVER)-ipfire" chroot $(MNThdd) \
+		grub-mkconfig -o /boot/grub/grub.cfg
# Boot the first kernel by default
    chroot $(MNThdd) grub-set-default 0
diff --git a/lfs/grub b/lfs/grub
index cc1581306..aed9e6ad8 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -125,6 +125,10 @@ ifeq "$(BUILD_PC)" "1"
    touch /boot/grub/grub.cfg
 endif
+	# Install our own helpers
+	install -v -m 644 $(DIR_SRC)/config/grub2/00_cloud \
+		/etc/grub.cfg
+
    # Install background image
    -mkdir -pv /boot/grub
    install -m 644 $(DIR_SRC)/config/grub2/splash.png /boot/grub/splash.png
hooks/post-receive
--
IPFire 2.x development tree

    