From patchwork Tue Jul 27 10:07:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4564 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GYssn6khqz3xGr for ; Tue, 27 Jul 2021 10:07:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GYssl0MXSz2b1; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GYssk5W3Bz2yd2; Tue, 27 Jul 2021 10:07:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GYssj26M6z2xSG for ; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GYssh2DvnzBX; Tue, 27 Jul 2021 10:07:20 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1627380440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FKWtOSN+GYyzvgLyJmjyDUHEC2xaSXqstxYOEvK58YM=; b=fZbyq937G3koI/3vaDAZS4o1ZPd+VYGpf71mr2XRpzfZ3gkVdZDdw9dmW5A3qKUFzr91qg LoBoN23WgVXMbZAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1627380440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FKWtOSN+GYyzvgLyJmjyDUHEC2xaSXqstxYOEvK58YM=; b=A99ZuurVo9YBh7y3FEuWlDJdNClGBEgehjc9ODy1bi9n6KT/ElqhUux7t1mb/vOpGER8QY F9AS0EbqEmNQTre4QBighLBIWNOGBlPd6NLF8Mr2rRMIP+I47xNWlhLZBx6DeU6aDOjjGp xXYw1kFQFCkpyji3XeDD1qunwbHAkbc+5X63H2bINOHGts8BaBvOQCdjVRGp5wAzRy9eK5 8exXDZxUZK9UJzKJo4gZGZW5lFH8Tp2iuXvAUlaX1X9g0HTZ7dtkfgORmW4BjPw5SwVPeL Qplm6nYieuqBDTyyQtP91zWV4WduzJ74ZZ3cGFJyjGMZibNgM6v7Y3t5DEzzxw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/4] flash-images: Label serial console option as "serial" Date: Tue, 27 Jul 2021 10:07:07 +0000 Message-Id: <20210727100710.5331-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/flash-images/grub/11_linux_scon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From patchwork Tue Jul 27 10:07:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4565 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GYssp1CNJz3xGv for ; Tue, 27 Jul 2021 10:07:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GYssl13ygz6YM; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GYssk66Fhz2ygf; Tue, 27 Jul 2021 10:07:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GYssj2Y2Yz2y2L for ; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GYssj0vwxz1Tn; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNFI/5IcbEqy6RRVWvOOdHheMFgrraFmiyQ08p72+Jg=; b=gHBXbSxhadQSNZ8SpjBwzPv8Bj2l4lhWx8ed776rHLjLqaEQAGJM2N6J3jkCpZd05ctlEE N50qGUeP4PsLMMDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNFI/5IcbEqy6RRVWvOOdHheMFgrraFmiyQ08p72+Jg=; b=jNe5EuysLX3JX3NciO9lSgjJS6CRDBRErDM64/N1EpGy3G1EE+H7h4leJjblcaSZt2J++o yHjxQ8EPv9F4N1SI+CTFoKJB2+5VgikqcG4IxvTstG+dqIWv99t8PS8sbaxg6dm2jOP66x 8tnbt5y5BGZzCR1PkYRBRTqJLmGsp0udewvRVKqQUO14Nj6s2kGaQ6Tt6z0Rn4D7afmdmq pWg42M8dvJdvBxuf8/QPRDDxbxN0TyOv/7jgBBCdcCliNQlb8TDyqFMBt8barOa0j5+eky RVwI5XYMhJ3FblW1CA2M6xRFDxQfFhT1/gzOU8KOEowNztyjAElSI2FyRIOmhw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/4] grub: Add file with cloud helping stuff Date: Tue, 27 Jul 2021 10:07:08 +0000 Message-Id: <20210727100710.5331-2-michael.tremer@ipfire.org> In-Reply-To: <20210727100710.5331-1-michael.tremer@ipfire.org> References: <20210727100710.5331-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- config/grub2/00_cloud | 26 ++++++++++++++++++++++++++ config/rootfiles/common/aarch64/grub | 1 + config/rootfiles/common/i586/grub | 1 + config/rootfiles/common/x86_64/grub | 1 + lfs/grub | 4 ++++ 5 files changed, 33 insertions(+) create mode 100644 config/grub2/00_cloud diff --git a/config/grub2/00_cloud b/config/grub2/00_cloud new file mode 100644 index 000000000..3f9c5a185 --- /dev/null +++ b/config/grub2/00_cloud @@ -0,0 +1,26 @@ +#!/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 "${boot_device_id}" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" +fi + +cat < X-Patchwork-Id: 4566 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GYssq08tsz3xHZ for ; Tue, 27 Jul 2021 10:07:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GYssl3JTJz6cs; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GYssl08qzz2ykC; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GYssj2y56z2y2d for ; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GYssj1nNGz2b1; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ur/qNkyor0y3O2DzR9/WUwEIVJOuPa4eCZhIX2Eo5Kw=; b=gHJKc7ytnp/9rkAOunvt/WIKshP+9JC1NDd1bdW3mEMjcPyCTGJnZobQe+d7OyreByncU3 UrQ87X0bhLplfrAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ur/qNkyor0y3O2DzR9/WUwEIVJOuPa4eCZhIX2Eo5Kw=; b=OpwC5kiCNq0ALwpadSCJajZlVLptDTytV57cEMfN3reXvOdGQaMT05a5nDnoESkcTeJIb1 svjHekarXt6pqOuKxXQ+l3guyW5BG4Ex/o0lxhvgkSBG5jWZzBufKcotDYnd1seH0farwU pBDi46aRebMGTCCFLc4pfYwLMtxJqEt6GaIWzbBYRkqN6U4IFip5Y2E9YeBiHAW9wEfXsv G1aoGfaYlT+NamvQikkXFMIZCNmh1HAw1zdxVZoypouhfOhkEQYfwo6beJZykoIu4RUo/1 /oW3sLOL5Y/FpeixvMIJeY8GD8CP2I1hXp8YisLDxCuc4Tf43qdDuH+vrNF8jQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/4] flash-image: Enable GRUB_FIRST_BOOT setting Date: Tue, 27 Jul 2021 10:07:09 +0000 Message-Id: <20210727100710.5331-3-michael.tremer@ipfire.org> In-Reply-To: <20210727100710.5331-1-michael.tremer@ipfire.org> References: <20210727100710.5331-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/flash-images | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lfs/flash-images b/lfs/flash-images index 72e635073..ca1ffa5e0 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 chroot $(MNThdd) \ + grub-mkconfig -o /boot/grub/grub.cfg # Boot the first kernel by default chroot $(MNThdd) grub-set-default 0 From patchwork Tue Jul 27 10:07:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4567 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GYssr3WWqz3xGr for ; Tue, 27 Jul 2021 10:07:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GYssl3nwQz6dk; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GYssl1K6Cz2ykp; Tue, 27 Jul 2021 10:07:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GYssj3dC3z2xSG for ; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GYssj2Y6yzBX; Tue, 27 Jul 2021 10:07:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E/558SMHhP2hoRLK7mNQTfa9NYqX+XzrV8uN27oJEbY=; b=XEbaEzqOtIsY2xW9RgfhvZqftBMX1HEtqs2Fz7p07Tnj0HV/G+gna1OSOY+NVC69eejbRC GA71/lz4xRFrwvAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1627380441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E/558SMHhP2hoRLK7mNQTfa9NYqX+XzrV8uN27oJEbY=; b=jBHVE00W3fnGJhTkTwTiRGb96Agrl4eTzftQ4vJTGLSEddVtMB21+1ApdKnyCE6Lps+XPS ZipB3FivC4UvQZ4NZZvBX+tgjSju3PMz03YLtOja47oxZ92sEaqWzVO8Zoj6j+yRZ3vct5 WmTO8bfv2i/1CUhcc+w6/Pn7wNdk5IPWmdsLCexjc7Z46XSBrEPXWhKdX55o56SSgF70KM dUNp7wig5chZ4hDaM8tdg4kbwBglkiQUd+XsNfJ7/1uVVhqANrGx/fl3QILff8/tQorIOJ s56BnFlLmgDFymxuq4+LpIb9c4pXzw09U525T55KDwF87OIxKRhkJ+VCveLGNw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 4/4] grub cloud: Add kernel release to boot ID Date: Tue, 27 Jul 2021 10:07:10 +0000 Message-Id: <20210727100710.5331-4-michael.tremer@ipfire.org> In-Reply-To: <20210727100710.5331-1-michael.tremer@ipfire.org> References: <20210727100710.5331-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/grub2/00_cloud | 6 +++++- lfs/flash-images | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/grub2/00_cloud b/config/grub2/00_cloud index 3f9c5a185..121cb2fbd 100644 --- a/config/grub2/00_cloud +++ b/config/grub2/00_cloud @@ -11,6 +11,10 @@ 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 @@ -21,6 +25,6 @@ smbios --type 1 --get-string 4 --set system_manufacturer # Are we on Amazon EC2? if [ "\$system_manufacturer" = "Amazon EC2" ]; then - next_entry=gnulinux-serial-${boot_device_id} + next_entry=gnulinux-${KERNEL_RELEASE}-serial-${boot_device_id} fi EOF diff --git a/lfs/flash-images b/lfs/flash-images index ca1ffa5e0..cdd0fbf7e 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -188,7 +188,7 @@ ifeq "$(BOOTLOADER)" "grub" # Create configuration mkdir -pv $(MNThdd)/boot/grub - GRUB_FIRST_BOOT=true chroot $(MNThdd) \ + GRUB_FIRST_BOOT=true KERNEL_RELEASE="$(KVER)-ipfire" chroot $(MNThdd) \ grub-mkconfig -o /boot/grub/grub.cfg # Boot the first kernel by default