From 28f413a394375fedc11c6ef0e982ef5e2dc19f46 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 30 Dec 2015 15:16:02 +0100 Subject: [PATCH] Current state --- .etckeeper | 2 +- config-archive/etc/default/grub | 15 +++++- config-archive/etc/default/grub.1 | 9 +++- config-archive/etc/default/grub.2 | 27 ++++++++--- .../etc/default/grub.3 | 47 ++++--------------- config-archive/etc/default/grub.dist | 2 +- default/grub | 2 +- 7 files changed, 54 insertions(+), 50 deletions(-) rename default/._cfg0000_grub => config-archive/etc/default/grub.3 (50%) diff --git a/.etckeeper b/.etckeeper index 1e36dba..5dc2e8e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -335,6 +335,7 @@ maybe chmod 0755 'config-archive/etc/default' maybe chmod 0644 'config-archive/etc/default/grub' maybe chmod 0644 'config-archive/etc/default/grub.1' maybe chmod 0644 'config-archive/etc/default/grub.2' +maybe chmod 0644 'config-archive/etc/default/grub.3' maybe chmod 0644 'config-archive/etc/default/grub.dist' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist' @@ -814,7 +815,6 @@ maybe chmod 0755 'dbus-1/system.d' maybe chmod 0644 'dbus-1/system.d/.keep_sys-apps_dbus-0' maybe chmod 0644 'dbus-1/system.d/cups.conf' maybe chmod 0755 'default' -maybe chmod 0644 'default/._cfg0000_grub' maybe chmod 0644 'default/grub' maybe chmod 0600 'default/useradd' maybe chmod 0644 'dhcpcd.conf' diff --git a/config-archive/etc/default/grub b/config-archive/etc/default/grub index 027df60..fcb7d23 100644 --- a/config-archive/etc/default/grub +++ b/config-archive/etc/default/grub @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: @@ -65,3 +65,14 @@ GRUB_DISABLE_LINUX_UUID=true # Uncomment to disable generation of recovery mode menu entries #GRUB_DISABLE_RECOVERY=true + +# Uncomment to disable generation of the submenu and put all choices on +# the top-level menu. +# Besides the visual affect of no sub menu, this makes navigation of the +# menu easier for a user who can't see the screen. +#GRUB_DISABLE_SUBMENU=y + +# Uncomment to play a tone when the main menu is displayed. +# This is useful, for example, to allow users who can't see the screen +# to know when they can make a choice on the menu. +#GRUB_INIT_TUNE="60 800 1" diff --git a/config-archive/etc/default/grub.1 b/config-archive/etc/default/grub.1 index 16776f5..027df60 100644 --- a/config-archive/etc/default/grub.1 +++ b/config-archive/etc/default/grub.1 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.3 2014/09/10 14:38:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.4 2014/10/16 04:04:02 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: @@ -44,6 +44,13 @@ GRUB_TIMEOUT=10 #GRUB_GFXMODE=640x480 GRUB_GFXMODE=800x600 +# Set to 'text' to force the Linux kernel to boot in normal text +# mode, 'keep' to preserve the graphics mode set using +# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular +# graphics mode, or a sequence of these separated by commas or +# semicolons to try several modes in sequence. +#GRUB_GFXPAYLOAD_LINUX= + # Path to theme spec txt file. # The starfield is by default provided with use truetype. # NOTE: when enabling custom theme, ensure you have required font/etc. diff --git a/config-archive/etc/default/grub.2 b/config-archive/etc/default/grub.2 index 1ea8691..16776f5 100644 --- a/config-archive/etc/default/grub.2 +++ b/config-archive/etc/default/grub.2 @@ -1,23 +1,36 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.3 2014/09/10 14:38:39 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: # 'grub2-mkconfig -o /boot/grub/grub.cfg' # # See the grub info page for documentation on possible variables and -# their associated values. +# their associated values. GRUB_DISTRIBUTOR="Gentoo" -GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=5 -GRUB_HIDDEN_TIMEOUT_QUIET=true +# Default menu entry +#GRUB_DEFAULT=0 + +# Boot the default entry this many seconds after the menu is displayed +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true +#GRUB_TIMEOUT=5 GRUB_TIMEOUT=10 +#GRUB_TIMEOUT_STYLE=menu # Append parameters to the linux kernel command line -# GRUB_CMDLINE_LINUX="" +#GRUB_CMDLINE_LINUX="" +# +# Examples: +# +# Boot with network interface renaming disabled +# GRUB_CMDLINE_LINUX="net.ifnames=0" +# +# Boot with systemd instead of sysvinit (openrc) +# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" # Append parameters to the linux kernel command line for non-recovery entries #GRUB_CMDLINE_LINUX_DEFAULT="" diff --git a/default/._cfg0000_grub b/config-archive/etc/default/grub.3 similarity index 50% rename from default/._cfg0000_grub rename to config-archive/etc/default/grub.3 index 35ab767..1ea8691 100644 --- a/default/._cfg0000_grub +++ b/config-archive/etc/default/grub.3 @@ -1,33 +1,23 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-2,v 1.4 2013/09/21 18:10:55 floppym Exp $ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: # 'grub2-mkconfig -o /boot/grub/grub.cfg' # # See the grub info page for documentation on possible variables and -# their associated values. +# their associated values. GRUB_DISTRIBUTOR="Gentoo" -# Default menu entry -#GRUB_DEFAULT=0 - -# Boot the default entry this many seconds after the menu is displayed -#GRUB_TIMEOUT=5 -#GRUB_TIMEOUT_STYLE=menu +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=5 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 # Append parameters to the linux kernel command line -#GRUB_CMDLINE_LINUX="" -# -# Examples: -# -# Boot with network interface renaming disabled -# GRUB_CMDLINE_LINUX="net.ifnames=0" -# -# Boot with systemd instead of sysvinit (openrc) -# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" +# GRUB_CMDLINE_LINUX="" # Append parameters to the linux kernel command line for non-recovery entries #GRUB_CMDLINE_LINUX_DEFAULT="" @@ -39,13 +29,7 @@ GRUB_DISTRIBUTOR="Gentoo" # 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 - -# Set to 'text' to force the Linux kernel to boot in normal text -# mode, 'keep' to preserve the graphics mode set using -# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular -# graphics mode, or a sequence of these separated by commas or -# semicolons to try several modes in sequence. -#GRUB_GFXPAYLOAD_LINUX= +GRUB_GFXMODE=800x600 # Path to theme spec txt file. # The starfield is by default provided with use truetype. @@ -57,18 +41,7 @@ GRUB_DISTRIBUTOR="Gentoo" #GRUB_BACKGROUND="/boot/grub/mybackground.png" # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel -#GRUB_DISABLE_LINUX_UUID=true +GRUB_DISABLE_LINUX_UUID=true # Uncomment to disable generation of recovery mode menu entries #GRUB_DISABLE_RECOVERY=true - -# Uncomment to disable generation of the submenu and put all choices on -# the top-level menu. -# Besides the visual affect of no sub menu, this makes navigation of the -# menu easier for a user who can't see the screen. -#GRUB_DISABLE_SUBMENU=y - -# Uncomment to play a tone when the main menu is displayed. -# This is useful, for example, to allow users who can't see the screen -# to know when they can make a choice on the menu. -#GRUB_INIT_TUNE="60 800 1" diff --git a/config-archive/etc/default/grub.dist b/config-archive/etc/default/grub.dist index 8ff053f..35ab767 100644 --- a/config-archive/etc/default/grub.dist +++ b/config-archive/etc/default/grub.dist @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $ +# $Id$ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: diff --git a/default/grub b/default/grub index fcb7d23..8d0573b 100644 --- a/default/grub +++ b/default/grub @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default-3,v 1.5 2015/03/25 01:58:00 floppym Exp $ +# $Id$ # # To populate all changes in this file you need to regenerate your # grub configuration file afterwards: -- 2.39.5