From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aBOin-0006JQ-5m for mharc-grub-devel@gnu.org; Tue, 22 Dec 2015 10:19:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBOij-0006IA-Gd for grub-devel@gnu.org; Tue, 22 Dec 2015 10:19:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBOid-00074v-N2 for grub-devel@gnu.org; Tue, 22 Dec 2015 10:19:25 -0500 Received: from mx1.riseup.net ([198.252.153.129]:35499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBOid-00073q-DO for grub-devel@gnu.org; Tue, 22 Dec 2015 10:19:19 -0500 Received: from cotinga.riseup.net (unknown [10.0.1.164]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 12CCF1A050D for ; Tue, 22 Dec 2015 07:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1450797558; bh=GXC579fKgQ88gNRyJ0sKGAksc9uy/C7Y+D/oY2hwZvo=; h=From:Subject:To:Date:From; b=XHeQDGUlw7ZJ9tY+t/BGZbeoicSPJ5NXEoM3WShvG7oCKDZvZKaMCzn6mBgd3XqQi l1JVe0klpAyBQFqwr1HeD0C1IHjD9Wy9q/KT+mPRgezwqi7AqTAmiajejq+WPetMbA vxei4gvHXa3TtBMYgwLqwbwSxqSzlMzb/X41CSDA= Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ypid) with ESMTPSA id 498174021B From: Robin Schneider Subject: [PATCH] Allow to add/change menu entry class defaults. X-Enigmail-Draft-Status: N1110 To: grub-devel@gnu.org Message-ID: <567969EB.1090109@riseup.net> Date: Tue, 22 Dec 2015 16:19:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.4.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000301000201060700070708" X-Virus-Scanned: clamav-milter 0.98.7 at mx1.riseup.net X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 198.252.153.129 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 15:19:26 -0000 This is a multi-part message in MIME format. --------------000301000201060700070708 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Useful for changing the default access level for menu entries when using GRUBs password protection feature. Ansible role which makes use of this patch: https://github.com/debops/ansible-grub/pull/7 Let me know what you think. - -- Live long and prosper Robin `ypid` Schneider -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJWeWnqAAoJEIb9mAu/GkD4VG4P/2b7pozgh8MCGJs+5W5tB2Ix JdNMnMi+txhVrSDUX2e0ILQkQk6+dVGAP5Lz3IyHtuJFogqdxYx+v5N/o31aAm6l obSCzbgf5DhKxig00Me/8rT6tpGllULqIeKge7gduxNIy9qT5lsSqdD8qvtRf+Mv Ak3KxOYH/smNVXBV2EuoqRHFE20GkDjUeW4ECgoB7k6kkVSBHikwo8cbzDSXnOqs aJlx7vI/Ztpud8qYyJQbV6S+ezcHOeMViydLkd7UmPxJysULjUQJ5vYOsXQKiUW+ o97/xvXLzrMO3XXbJEub9utJYMqvsug1I9fzdPlJ+TmPVxGT9Cuw1RY3a/W60jXX Vg8mu2DaZZeUP9U7BqrpAeKA0Rj/WEiYq++V11n7vx1MwvSRdXRtftGabKCTGSHq a1IobHu3ojcbCj/q3V1c+N6SLGAWvzaSlcJurAKpNGGaxj628MvU9kYsqwImPxEW mToRs0CEu7HS0+kQa3doSpArV1mC0tAb0MtEAQ/OZtfxMdGfgC1LSXwk6hWPi26x 4/bMeUr7eJzN9uSta5xUSW+7n4ooa7LN8sxY9DkQT3glWyUyZCPVwbXmI96nWZ8J owMFvrU3tIV5llEpZ9sg1YUFKYkrpDffdRN5Qsnzm8gL72urPJ4B7S12c9rmut8p 1bU5G+0z+hM0/DBdVWTE =bJj/ -----END PGP SIGNATURE----- --------------000301000201060700070708 Content-Type: text/x-patch; name="0001-Allow-to-add-change-menu-entry-class-defaults.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Allow-to-add-change-menu-entry-class-defaults.patch" >From f769c045f246859224fbf0037a5617cdf4de35bb Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Tue, 22 Dec 2015 16:11:13 +0100 Subject: [PATCH] Allow to add/change menu entry class defaults. Useful for changing the default access level for menu entries when using GRUBs password protection feature. Ansible role which makes use of this patch: https://github.com/debops/ansible-grub/pull/7 --- util/grub-mkconfig.in | 12 +++++++++++- util/grub.d/10_hurd.in | 2 +- util/grub.d/10_illumos.in | 2 +- util/grub.d/10_kfreebsd.in | 2 +- util/grub.d/10_linux.in | 2 +- util/grub.d/20_linux_xen.in | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 3183744..56a88e2 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -227,7 +227,17 @@ export GRUB_DEFAULT \ GRUB_ENABLE_CRYPTODISK \ GRUB_BADRAM \ GRUB_OS_PROBER_SKIP_LIST \ - GRUB_DISABLE_SUBMENU + GRUB_DISABLE_SUBMENU \ + GRUB_LINUX_MENUENTRY_CLASS \ + GRUB_LINUX_MENUENTRY_CLASS_ADDITIONAL \ + GRUB_XEN_MENUENTRY_CLASS \ + GRUB_XEN_MENUENTRY_CLASS_ADDITIONAL \ + GRUB_HURD_MENUENTRY_CLASS \ + GRUB_HURD_MENUENTRY_CLASS_ADDITIONAL \ + GRUB_ILLUMOS_MENUENTRY_CLASS \ + GRUB_ILLUMOS_MENUENTRY_CLASS_ADDITIONAL \ + GRUB_KFREEBSD_MENUENTRY_CLASS \ + GRUB_KFREEBSD_MENUENTRY_CLASS_ADDITIONAL if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in index 59a9a48..4b31d11 100644 --- a/util/grub.d/10_hurd.in +++ b/util/grub.d/10_hurd.in @@ -26,7 +26,7 @@ export TEXTDOMAINDIR="@localedir@" . "$pkgdatadir/grub-mkconfig_lib" -CLASS="--class gnu --class os" +CLASS=${GRUB_HURD_MENUENTRY_CLASS:-"--class gnu --class os ${GRUB_HURD_MENUENTRY_CLASS_ADDITIONAL:-}"} if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU diff --git a/util/grub.d/10_illumos.in b/util/grub.d/10_illumos.in index a133e1b..0f62a24 100644 --- a/util/grub.d/10_illumos.in +++ b/util/grub.d/10_illumos.in @@ -25,7 +25,7 @@ datarootdir="@datarootdir@" export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR="@localedir@" -CLASS="--class os" +CLASS=${GRUB_ILLUMOS_MENUENTRY_CLASS:-"--class os ${GRUB_ILLUMOS_MENUENTRY_CLASS_ADDITIONAL:-}"} case "${GRUB_DISTRIBUTOR}" in *) diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in index 9d8e8fd..773d151 100644 --- a/util/grub.d/10_kfreebsd.in +++ b/util/grub.d/10_kfreebsd.in @@ -25,7 +25,7 @@ datarootdir="@datarootdir@" export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR="@localedir@" -CLASS="--class os" +CLASS=${GRUB_KFREEBSD_MENUENTRY_CLASS:-"--class os ${GRUB_KFREEBSD_MENUENTRY_CLASS_ADDITIONAL:-}"} case "${GRUB_DISTRIBUTOR}" in Debian) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index 859b608..18fb521 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -26,7 +26,7 @@ datarootdir="@datarootdir@" export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR="@localedir@" -CLASS="--class gnu-linux --class gnu --class os" +CLASS=${GRUB_LINUX_MENUENTRY_CLASS:-"--class gnu-linux --class gnu --class os ${GRUB_LINUX_MENUENTRY_CLASS_ADDITIONAL:-}"} if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index f532fb9..fcc8cf9 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -26,7 +26,7 @@ datarootdir="@datarootdir@" export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAINDIR="@localedir@" -CLASS="--class gnu-linux --class gnu --class os --class xen" +CLASS=${GRUB_XEN_MENUENTRY_CLASS:-"--class gnu-linux --class gnu --class os --class xen ${GRUB_XEN_MENUENTRY_CLASS_ADDITIONAL:-}"} if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux -- 2.1.4 --------------000301000201060700070708 Content-Type: application/pgp-signature; name="0001-Allow-to-add-change-menu-entry-class-defaults.patch.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Allow-to-add-change-menu-entry-class-defaults.patch.sig" iQIcBAABCgAGBQJWeWnrAAoJEIb9mAu/GkD4haMP/22xiG3IXDhIKskj4DMkGNq8SWVHngi3 0GwT61yPT9dts1QTdBaYcBo1fwnPBCicqhRNtAwhNZpsE1j8g7rZt9oiIslsNUcH+a0d2iZG D85M/g1fImZBBnkyXbSP8Th1h4QsOtkl7Si0au/DHngVIydrV9H++No3vne93z/mLOkfMcZk rKOOH3/A7mc/1ESVX4mGus0eCXBcWQH4fBBPDngf9XaSYeC17U2rWLFlzgCCFdzNapBQ73w8 cQkeiFwS9H0s++Eqfvj4OhgM6nmQ9HJ9qG0/EFlQxq/3neW7iiKLP+sTMph+BAffdQgQ/MZB MvUZRxAuE1hRRaSYljehTCR8jIUlzWBBclXi01mskecalPrKcufiUFMm+PrvE4bD6RwQtH/I bwjHQPnp1aDqHocBxYWeqxwCwHVDqVV7AgekjVVwGn+yaWW1OhoBfWGJzSLbuCSQMDeciwZk /wd8qV+kQaPADlc1gGZf0RMrbA1/PpKqohUwIHBrsNFSIwcYO1gdlYO6IQuy0tSYJPGdHicI FexN4AXIxcY+rmrGwLCajf/mYOKWfGASIEEV8Z9qoDs9BH9bNTCRKXV4R7PWuZL+JFut62of N6h3giY8kWe+eNIQT63kihPVOL0hqE9lVz3/0pnxUCPLLZJ5b7NVt2aSojnhosnrgRTX9Wfe DQyc --------------000301000201060700070708--