grub: Move everything to /usr and come with better defaults.

diff --git a/grub/default/grub b/grub/default/grub
index fe159a61f7ca64a87dae907b1ca0aeaac977a7ba..0fe9d7c14f0b5340afbe61f713229d8e4f349ef1 100644 (file)
--- a/grub/default/grub
+++ b/grub/default/grub
@@ -1,27 +1,8 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-GRUB_DISTRIBUTOR=$(sed -n 's/\([A-Za-z0-9]*\) release \([0-9A-Za-z\.\-]*\) .*/\1 \2/p' < /etc/system-release)
-GRUB_CMDLINE_LINUX_DEFAULT="quiet selinux=0"
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_LINUX_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)"
+GRUB_DEFAULT=saved
+GRUB_SAVEDEFAULT=true
+# GRUB_TERMINAL="serial console"
+# GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200"
+GRUB_CMDLINE_LINUX="quiet rhgb"
+GRUB_DISABLE_RECOVERY="true"

diff --git a/grub/grub.nm b/grub/grub.nm
index b3a0c6d334199f6f1b004ecef94ebe6ef2c25211..e9ec4330f89575e8cb1303080194fa7f83e129e7 100644 (file)
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
 
 name       = grub
 version    = 1.99
-release    = 5
+release    = 6
 sup_arches = x86_64 i686
 
 groups     = System/Boot
@@ -56,7 +56,6 @@ build
 
        configure_options += \
                --target="i386" \
-               --sbindir=/sbin \
                --datadir=%{libdir} \
                --with-platform=pc \
                --program-transform-name=s,grub,grub, \
@@ -101,7 +100,7 @@ build
 
                mv -v %{BUILDROOT}/etc/bash_completion.d/grub{,-efi}
                sed -e "s,grub/grub-mkconfig_lib,grub-efi/grub-mkconfig_lib," \
-                       -i %{BUILDROOT}/sbin/grub-efi-mkconfig
+                       -i %{BUILDROOT}%{sbindir}/grub-efi-mkconfig
 
                install -m 755 -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/
                install -d %{BUILDROOT}/boot/efi/EFI/%{DISTRO_SNAME}/grub-efi
@@ -168,9 +167,9 @@ packages
                        /boot/efi
                        /etc/bash_completion.d/grub-efi
                        /etc/grub-efi.cfg
-                       /sbin/grub-efi-*
-                       /usr/bin/grub-efi-*
-                       /usr/lib/grub-efi
+                       %{sbindir}/grub-efi-*
+                       %{bindir}/grub-efi-*
+                       %{prefix}/lib/grub-efi
                end
        end