From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aBqQw-0007XH-4s for mharc-grub-devel@gnu.org; Wed, 23 Dec 2015 15:54:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqQt-0007WU-E4 for grub-devel@gnu.org; Wed, 23 Dec 2015 15:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBqQq-0000qV-2w for grub-devel@gnu.org; Wed, 23 Dec 2015 15:54:51 -0500 Received: from mx1.riseup.net ([198.252.153.129]:35602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqQp-0000qG-OS for grub-devel@gnu.org; Wed, 23 Dec 2015 15:54:48 -0500 Received: from piha.riseup.net (unknown [10.0.1.163]) (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 7B4471A1E21 for ; Wed, 23 Dec 2015 12:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1450904086; bh=YjSBF5Ke/6iEpKMz1s7GxzC2i1ZXL94xr8Cmx4G5DJw=; h=Subject:To:References:From:Date:In-Reply-To:From; b=SRRa8T/BwMRAXm0h7kVojYLmDkgwMXHzFsYhYe9i1UhAUQin8Nm66XPnk2dp+W6IA pmbMN02CKGN34l3Vj0wxcparbRi1YLmO1UYMnabldTQwZtIOLcCR4Fw4nN6U9CqusF Gc6WF47CaRZuU7zEh4iS1muRfziE9Fa+YZVvPbtg= Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ypid) with ESMTPSA id F25891C005B Subject: Re: [PATCH] Allow to add/change menu entry class defaults. To: grub-devel@gnu.org References: <567969EB.1090109@riseup.net> From: Robin Schneider Message-ID: <567B0A0A.2050804@riseup.net> Date: Wed, 23 Dec 2015 21:54:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------060509090601090106000501" 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: Wed, 23 Dec 2015 20:54:53 -0000 This is a multi-part message in MIME format. --------------060509090601090106000501 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 23.12.2015 07:58, Andrei Borzenkov wrote: > On Tue, Dec 22, 2015 at 6:19 PM, Robin Schneider wrote: >> 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 >> > > That's overcomplicated. The first class found wins and you will not define > them unless you have them. So just having > > class="$GRUB_..._CLASS --class ..." > > is really enough. Thanks for the input. I agree that my first patch was probably a bit to flexible. I attached a updated patch. > >> Let me know what you think. >> > > I'm not sure I like turning grub-mkconfig into kitchen sink, but yes, that > probably makes sense. It allows easy vendor-specific icons without need to > patch grub every time. > >> -CLASS="--class gnu-linux --class gnu --class os --class xen" > > I guess "--class xen" should be in front as most specific (unrelated to > your patch). > > I have half baked patch lying around that tries to use more sensible icons > in os-prober as well. May be it's time to revisit it. - -- Live long and prosper Robin `ypid` Schneider -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJWewoKAAoJEIb9mAu/GkD4tJoQAMtvZcUGrksI0VtCVOJvibrr 2/NN2B2191blBIgi9HffciLUDaI3zX1g3dWwhXh0PYLdMmxyfbR3ewK/bzHWN9gg amCGsyPPbaWBpsE6c2jhLDqFX+on67DCCXiCS4QJX+u31ZwRbZhqhekAvZxvH00W pju/2WEMQv4CA15lBvBYB/y6Sux1sNyl/4jdC5ZvtAgsNAj+Z1ADebSsi7G+ym48 N1gbjgFOR1p4ORfSKjhHvGAfJ/8JaNatphp1BMYJImozy/ktZC+vbr+7N/tc/LW2 XWxpi3drKM2x8kZerGA4vITVjTxWZyrkQtErRQPROE6r+NxoqUotzny7y2KSZtCB 3ncEn10sA360o5TLnY5WCqrN7XbLh73T/g7ePWCumy/IIKAY9oPuxzFI/vLElzDf QBAhL/G7GYTRJX5nwRVbeMwwhcx+UrxllSSLswcLZCCpfO2XQXDSjlZiGVfvoRMS oxmF/kQ5GD2X3Chs33gX4cPCE4NPf1xdg0mQEnpx8e3RcdaLR5kki8p8mi97ME+j LyMJDUZsbnrz0ylljdieDJWHnHFLrRuj4Qksn0bWUTG/+1zSSX66rzGVzP9/pwKv /3JkN2D7q3aTBcBts9BzeJgomi1iJtDsbd03ve1SiTX9iUH+6lylToxtuCT3T4jX SF0yyzjjewj7idRFrhH6 =JF0U -----END PGP SIGNATURE----- --------------060509090601090106000501 Content-Type: text/x-patch; name="0001-Allow-to-add-change-menu-entry-class-defaults.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Allow-to-add-change-menu-entry-class-defaults.patch" >From c8a8c9901837f4d4217507cf82a754b99111e721 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Wed, 23 Dec 2015 17:23:42 +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 | 7 ++++++- 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, 11 insertions(+), 6 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 3183744..3f5468c 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -227,7 +227,12 @@ export GRUB_DEFAULT \ GRUB_ENABLE_CRYPTODISK \ GRUB_BADRAM \ GRUB_OS_PROBER_SKIP_LIST \ - GRUB_DISABLE_SUBMENU + GRUB_DISABLE_SUBMENU \ + GRUB_LINUX_MENUENTRY_CLASS \ + GRUB_XEN_MENUENTRY_CLASS \ + GRUB_HURD_MENUENTRY_CLASS \ + GRUB_ILLUMOS_MENUENTRY_CLASS \ + GRUB_KFREEBSD_MENUENTRY_CLASS 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..9c3ba8e 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" 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..db85554 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" case "${GRUB_DISTRIBUTOR}" in *) diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in index 9d8e8fd..fb9f4b0 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" case "${GRUB_DISTRIBUTOR}" in Debian) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index 859b608..266158b 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" 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..80d0f9b 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" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux -- 2.1.4 --------------060509090601090106000501 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" iQIcBAABCgAGBQJWewoKAAoJEIb9mAu/GkD4AvwQANRErvdgkB+KXxLUo/jJ5IjFsYKzERWR miQgHNL8/eSeb2I16i2pt37kQspML97iG1u0pq0J78mwfZ4r5B4Rf9pDe4jr6chLcGZSFStJ +6/oCnxkWvrlqOwTcb9b5/Q0OptjGmciTGZjEtCS1SorLAddLl7oYAn1644PnKZHssmUlFwY Ftk0clAOeXMej0DobdEUcyJisUzx13d25TS+EidKbBxJMP9zzzwxv/ixB/VLsQjdq0jU7n0J r0AGMHu8lvpGRbXU+ZY+9ujIt4mtemMU33za25OQRxJNA5XIsPvrRZE8n95nkbcH+kyCk19e DWLogZdWfsff2fn20xKtWe8Di2upqUryqSToeHSQ9YrXDtBfCessRaLfCrGPBBTi+eHetSqj 7j2KTkJCXywrPzy10vqcdmXXL7YMZDc9ScnmP4tPvl7haIX4C9sBcKsnkyeUkW0pMESrjY3c Bhm/CPAALsW5/sNhF6D2PSPHlGCpT544RCY75yrrxqURYiFeNvTBqur/K/NErkJetk4RwbmJ mdCoaPGUyEK85lDnyv9N6DX2vLKfdkBTG2PM8bR8DqfnJKPseh5S1ok8nC139tWdgAbD5pQN FiM2oLG7Sdqyg5ot7sb6vSqqXSZ7dc1mmVAJ9gvFiT4nZWf/xTK6GsnX4M3gRkz5QYZkzt+Y hSd6 --------------060509090601090106000501--