>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 address@hidden@ 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 address@hidden@ 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 address@hidden@ 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 address@hidden@ 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