From eb21decc6539ec0a9c75d7ec908b3c04a5632419 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 31 Jul 2017 09:48:19 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 3 + config-archive/etc/default/grub | 77 ++++++++++++++++++++++ config-archive/etc/default/grub.dist.new | 73 ++++++++++++++++++++ config-archive/etc/logrotate.conf.dist.new | 1 - portage/make.conf | 2 +- 5 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 config-archive/etc/default/grub create mode 100644 config-archive/etc/default/grub.dist.new diff --git a/.etckeeper b/.etckeeper index 1630d06..aafa194 100755 --- a/.etckeeper +++ b/.etckeeper @@ -181,6 +181,9 @@ maybe chmod 0644 'config-archive/etc/conf.d/apache2' maybe chmod 0644 'config-archive/etc/conf.d/apache2.dist.new' maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster' maybe chmod 0644 'config-archive/etc/conf.d/puppetmaster.dist.new' +maybe chmod 0755 'config-archive/etc/default' +maybe chmod 0644 'config-archive/etc/default/grub' +maybe chmod 0644 'config-archive/etc/default/grub.dist.new' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist.new' maybe chmod 0644 'config-archive/etc/genkernel.conf' diff --git a/config-archive/etc/default/grub b/config-archive/etc/default/grub new file mode 100644 index 0000000..1895331 --- /dev/null +++ b/config-archive/etc/default/grub @@ -0,0 +1,77 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +# +# 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. + +GRUB_DISTRIBUTOR="VM Berta (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_TIMEOUT=10 +GRUB_TIMEOUT_STYLE=menu + +# 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="dolvm init=/usr/lib/systemd/systemd" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# 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 + +# 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. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#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 + +# 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.new b/config-archive/etc/default/grub.dist.new new file mode 100644 index 0000000..593b019 --- /dev/null +++ b/config-archive/etc/default/grub.dist.new @@ -0,0 +1,73 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# +# 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. + +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 + +# 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" + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" + +# 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 + +# 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. +#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#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 + +# 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/logrotate.conf.dist.new b/config-archive/etc/logrotate.conf.dist.new index b6292ec..ff3319f 100644 --- a/config-archive/etc/logrotate.conf.dist.new +++ b/config-archive/etc/logrotate.conf.dist.new @@ -1,4 +1,3 @@ -# $Id$ # # Default logrotate(8) configuration file for Gentoo Linux. # See "man logrotate" for details. diff --git a/portage/make.conf b/portage/make.conf index 1a87fc3..d09dd6c 100644 --- a/portage/make.conf +++ b/portage/make.conf @@ -58,7 +58,7 @@ APACHE2_MODULES="access_compat actions alias asis auth_basic authn_core auth_dig mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_fcgi proxy_ftp proxy_html proxy_http proxy_scgi proxy_wstunnel ratelimit remoteip reqtimeout rewrite setenvif slotmem_shm socache_shmcb so speling status - substitute unique_id unixd userdir usertrack version vhost_alias + substitute unique_id unixd userdir usertrack version vhost_alias xml2enc " # http2 -- 2.39.5