From c60c92a33a631cc7db7a7a4cd0d1d98daa67c950 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 May 2017 16:53:32 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 5 +- bind/bind.keys | 65 +++-- conf.d/postgresql-9.5 | 10 +- config-archive/etc/bind/bind.keys | 2 +- config-archive/etc/bind/bind.keys.1 | 47 ++++ config-archive/etc/bind/bind.keys.dist | 65 +++-- ...resql-9.5.dist.new => postgresql-9.5.dist} | 7 + config-archive/etc/default/grub | 2 +- config-archive/etc/default/grub.1 | 15 +- config-archive/etc/default/grub.2 | 13 +- config-archive/etc/default/grub.3 | 21 +- config-archive/etc/default/grub.4 | 53 ++++ config-archive/etc/default/grub.dist | 1 - config-archive/etc/rc.conf.dist | 7 +- config-archive/etc/rc.conf.dist.new | 250 ------------------ default/grub | 1 - rc.conf | 6 + 17 files changed, 260 insertions(+), 310 deletions(-) create mode 100644 config-archive/etc/bind/bind.keys.1 rename config-archive/etc/conf.d/{postgresql-9.5.dist.new => postgresql-9.5.dist} (88%) create mode 100644 config-archive/etc/default/grub.4 delete mode 100644 config-archive/etc/rc.conf.dist.new diff --git a/.etckeeper b/.etckeeper index c785008..03738f7 100755 --- a/.etckeeper +++ b/.etckeeper @@ -571,6 +571,7 @@ maybe chmod 0644 'config-archive/etc/bash/bashrc.dist.new' maybe chmod 0755 'config-archive/etc/bind' maybe chmod 0640 'config-archive/etc/bind/bind.keys' maybe chmod 0644 'config-archive/etc/bind/bind.keys,v' +maybe chmod 0640 'config-archive/etc/bind/bind.keys.1' maybe chmod 0640 'config-archive/etc/bind/bind.keys.dist' maybe chmod 0644 'config-archive/etc/bind/named.conf' maybe chmod 0644 'config-archive/etc/bind/named.conf,v' @@ -611,7 +612,7 @@ maybe chmod 0644 'config-archive/etc/conf.d/net.example,v' maybe chmod 0644 'config-archive/etc/conf.d/ntpd,v' maybe chmod 0644 'config-archive/etc/conf.d/ntpd.dist.new' maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.5' -maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.5.dist.new' +maybe chmod 0644 'config-archive/etc/conf.d/postgresql-9.5.dist' maybe chmod 0640 'config-archive/etc/conf.d/postgrey' maybe chmod 0644 'config-archive/etc/conf.d/postgrey,v' maybe chmod 0640 'config-archive/etc/conf.d/postgrey.dist' @@ -675,6 +676,7 @@ 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.4' maybe chmod 0644 'config-archive/etc/default/grub.dist' maybe chmod 0644 'config-archive/etc/dhcpcd.conf,v' maybe chmod 0644 'config-archive/etc/dispatch-conf.conf' @@ -962,7 +964,6 @@ maybe chmod 0644 'config-archive/etc/rc.conf.6' maybe chmod 0644 'config-archive/etc/rc.conf.7' maybe chmod 0644 'config-archive/etc/rc.conf.8' maybe chmod 0644 'config-archive/etc/rc.conf.dist' -maybe chmod 0644 'config-archive/etc/rc.conf.dist.new' maybe chmod 0755 'config-archive/etc/reoback' maybe chmod 0644 'config-archive/etc/reoback/files.conf' maybe chmod 0644 'config-archive/etc/reoback/files.conf.dist' diff --git a/bind/bind.keys b/bind/bind.keys index d932678..81eb586 100644 --- a/bind/bind.keys +++ b/bind/bind.keys @@ -15,33 +15,56 @@ # # This file is NOT expected to be user-configured. # -# These keys are current as of January 2011. If any key fails to +# These keys are current as of Feburary 2017. If any key fails to # initialize correctly, it may have expired. In that event you should # replace this file with a current version. The latest version of # bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys. managed-keys { - # ISC DLV: See https://www.isc.org/solutions/dlv for details. - # NOTE: This key is activated by setting "dnssec-lookaside auto;" - # in named.conf. - dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 - brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ - 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 - ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk - Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM - QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt - TDN0YUuWrBNh"; + # ISC DLV: See https://www.isc.org/solutions/dlv for details. + # + # NOTE: The ISC DLV zone is being phased out as of February 2017; + # the key will remain in place but the zone will be otherwise empty. + # Configuring "dnssec-lookaside auto;" to activate this key is + # harmless, but is no longer useful and is not recommended. + dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 + brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ + 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 + ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk + Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM + QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt + TDN0YUuWrBNh"; - # ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml - # for current trust anchor information. - # NOTE: This key is activated by setting "dnssec-validation auto;" + # ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml + # for current trust anchor information. + # + # These keys are activated by setting "dnssec-validation auto;" # in named.conf. - . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF - FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX - bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD - X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz - W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS - Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq - QxA+Uk1ihz0="; + # + # This key (19036) is to be phased out starting in 2017. It will + # remain in the root zone for some time after its successor key + # has been added. It will remain this file until it is removed from + # the root zone. + . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF + FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX + bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD + X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz + W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS + Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq + QxA+Uk1ihz0="; + + # This key (20326) is to be published in the root zone in 2017. + # Servers which were already using the old key should roll to the + # new # one seamlessly. Servers being set up for the first time + # can use either of the keys in this file to verify the root keys + # for the first time; thereafter the keys in the zone will be + # trusted and maintained automatically. + . initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3 + +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv + ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF + 0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e + oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd + RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN + R1AkUTV74bU="; }; # vim: ts=4 filetype=named noai diff --git a/conf.d/postgresql-9.5 b/conf.d/postgresql-9.5 index 7750f50..f7cf112 100644 --- a/conf.d/postgresql-9.5 +++ b/conf.d/postgresql-9.5 @@ -1,3 +1,10 @@ +# Comma-separated list of directories that contain a unix +# socket. Created and controlled by the related initscript. The +# directories created will be owned root:postgres with mode 1775. +# +# /run/postgresql is the default directory. +PG_SOCKET_DIRECTORIES="/run/postgresql" + # Which port and socket to bind PostgreSQL PGPORT="5432" @@ -55,5 +62,6 @@ DATA_DIR="/var/lib/postgresql/9.5/data" # Additional options to pass to initdb. # See `man initdb' for available options. -PG_INITDB_OPTS="--encoding=UTF8 --locale=de_DE.utf8 --pwfile=/var/lib/postgresql/.admin-pwd.txt" +# PG_INITDB_OPTS="--encoding=UTF8" +PG_INITDB_OPTS="--encoding=UTF8 --locale=de_DE.utf8 --pwfile=/var/lib/postgresql/.admin-pwd.txt" diff --git a/config-archive/etc/bind/bind.keys b/config-archive/etc/bind/bind.keys index f6d79dc..d932678 100644 --- a/config-archive/etc/bind/bind.keys +++ b/config-archive/etc/bind/bind.keys @@ -1,4 +1,4 @@ -/* $Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp $ */ +/* $Id: bind.keys,v 1.7 2011/01/03 23:45:07 each Exp $ */ # The bind.keys file is used to override the built-in DNSSEC trust anchors # which are included as part of BIND 9. As of the current release, the only # trust anchors it contains are those for the DNS root zone ("."), and for diff --git a/config-archive/etc/bind/bind.keys.1 b/config-archive/etc/bind/bind.keys.1 new file mode 100644 index 0000000..f6d79dc --- /dev/null +++ b/config-archive/etc/bind/bind.keys.1 @@ -0,0 +1,47 @@ +/* $Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp $ */ +# The bind.keys file is used to override the built-in DNSSEC trust anchors +# which are included as part of BIND 9. As of the current release, the only +# trust anchors it contains are those for the DNS root zone ("."), and for +# the ISC DNSSEC Lookaside Validation zone ("dlv.isc.org"). Trust anchors +# for any other zones MUST be configured elsewhere; if they are configured +# here, they will not be recognized or used by named. +# +# The built-in trust anchors are provided for convenience of configuration. +# They are not activated within named.conf unless specifically switched on. +# To use the built-in root key, set "dnssec-validation auto;" in +# named.conf options. To use the built-in DLV key, set +# "dnssec-lookaside auto;". Without these options being set, +# the keys in this file are ignored. +# +# This file is NOT expected to be user-configured. +# +# These keys are current as of January 2011. If any key fails to +# initialize correctly, it may have expired. In that event you should +# replace this file with a current version. The latest version of +# bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys. + +managed-keys { + # ISC DLV: See https://www.isc.org/solutions/dlv for details. + # NOTE: This key is activated by setting "dnssec-lookaside auto;" + # in named.conf. + dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 + brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ + 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 + ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk + Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM + QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt + TDN0YUuWrBNh"; + + # ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml + # for current trust anchor information. + # NOTE: This key is activated by setting "dnssec-validation auto;" + # in named.conf. + . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF + FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX + bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD + X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz + W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS + Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq + QxA+Uk1ihz0="; +}; +# vim: ts=4 filetype=named noai diff --git a/config-archive/etc/bind/bind.keys.dist b/config-archive/etc/bind/bind.keys.dist index 068a8ce..80523ad 100644 --- a/config-archive/etc/bind/bind.keys.dist +++ b/config-archive/etc/bind/bind.keys.dist @@ -15,32 +15,55 @@ # # This file is NOT expected to be user-configured. # -# These keys are current as of January 2011. If any key fails to +# These keys are current as of Feburary 2017. If any key fails to # initialize correctly, it may have expired. In that event you should # replace this file with a current version. The latest version of # bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys. managed-keys { - # ISC DLV: See https://www.isc.org/solutions/dlv for details. - # NOTE: This key is activated by setting "dnssec-lookaside auto;" - # in named.conf. - dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 - brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ - 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 - ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk - Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM - QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt - TDN0YUuWrBNh"; + # ISC DLV: See https://www.isc.org/solutions/dlv for details. + # + # NOTE: The ISC DLV zone is being phased out as of February 2017; + # the key will remain in place but the zone will be otherwise empty. + # Configuring "dnssec-lookaside auto;" to activate this key is + # harmless, but is no longer useful and is not recommended. + dlv.isc.org. initial-key 257 3 5 "BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 + brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ + 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 + ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk + Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM + QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt + TDN0YUuWrBNh"; - # ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml - # for current trust anchor information. - # NOTE: This key is activated by setting "dnssec-validation auto;" + # ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml + # for current trust anchor information. + # + # These keys are activated by setting "dnssec-validation auto;" # in named.conf. - . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF - FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX - bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD - X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz - W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS - Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq - QxA+Uk1ihz0="; + # + # This key (19036) is to be phased out starting in 2017. It will + # remain in the root zone for some time after its successor key + # has been added. It will remain this file until it is removed from + # the root zone. + . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF + FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX + bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD + X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz + W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS + Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq + QxA+Uk1ihz0="; + + # This key (20326) is to be published in the root zone in 2017. + # Servers which were already using the old key should roll to the + # new # one seamlessly. Servers being set up for the first time + # can use either of the keys in this file to verify the root keys + # for the first time; thereafter the keys in the zone will be + # trusted and maintained automatically. + . initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3 + +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv + ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF + 0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e + oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd + RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN + R1AkUTV74bU="; }; diff --git a/config-archive/etc/conf.d/postgresql-9.5.dist.new b/config-archive/etc/conf.d/postgresql-9.5.dist similarity index 88% rename from config-archive/etc/conf.d/postgresql-9.5.dist.new rename to config-archive/etc/conf.d/postgresql-9.5.dist index f50cf5f..f76e13c 100644 --- a/config-archive/etc/conf.d/postgresql-9.5.dist.new +++ b/config-archive/etc/conf.d/postgresql-9.5.dist @@ -1,3 +1,10 @@ +# Comma-separated list of directories that contain a unix +# socket. Created and controlled by the related initscript. The +# directories created will be owned root:postgres with mode 1775. +# +# /run/postgresql is the default directory. +PG_SOCKET_DIRECTORIES="/run/postgresql" + # Which port and socket to bind PostgreSQL PGPORT="5432" diff --git a/config-archive/etc/default/grub b/config-archive/etc/default/grub index 2934b9a..3150091 100644 --- a/config-archive/etc/default/grub +++ b/config-archive/etc/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: diff --git a/config-archive/etc/default/grub.1 b/config-archive/etc/default/grub.1 index 365e64c..2934b9a 100644 --- a/config-archive/etc/default/grub.1 +++ b/config-archive/etc/default/grub.1 @@ -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: @@ -69,3 +69,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.2 b/config-archive/etc/default/grub.2 index f3be2eb..365e64c 100644 --- a/config-archive/etc/default/grub.2 +++ b/config-archive/etc/default/grub.2 @@ -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: @@ -12,10 +12,8 @@ GRUB_DISTRIBUTOR="Gentoo (Helga)" # Default menu entry -GRUB_DEFAULT=0 +#GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=5 -GRUB_HIDDEN_TIMEOUT_QUIET=true # Boot the default entry this many seconds after the menu is displayed GRUB_TIMEOUT=10 #GRUB_TIMEOUT_STYLE=menu @@ -50,6 +48,13 @@ GRUB_SERIAL_COMMAND="serial --speed=57600 --unit=0 --word=8 --parity=no --stop=1 # 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. diff --git a/config-archive/etc/default/grub.3 b/config-archive/etc/default/grub.3 index e810299..f3be2eb 100644 --- a/config-archive/etc/default/grub.3 +++ b/config-archive/etc/default/grub.3 @@ -1,22 +1,35 @@ -# 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_DISTRIBUTOR="Gentoo (Helga)" +# Default menu entry GRUB_DEFAULT=0 + GRUB_HIDDEN_TIMEOUT=5 GRUB_HIDDEN_TIMEOUT_QUIET=true +# Boot the default entry this many seconds after the menu is displayed 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="console=tty0 console=ttyS0,57600n8 domdadm dolvm" GRUB_PRELOAD_MODULES=lvm diff --git a/config-archive/etc/default/grub.4 b/config-archive/etc/default/grub.4 new file mode 100644 index 0000000..e810299 --- /dev/null +++ b/config-archive/etc/default/grub.4 @@ -0,0 +1,53 @@ +# Copyright 1999-2013 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 $ +# +# 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" + +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="console=tty0 console=ttyS0,57600n8 domdadm dolvm" + +GRUB_PRELOAD_MODULES=lvm + +# Append parameters to the linux kernel command line for non-recovery entries +#GRUB_CMDLINE_LINUX_DEFAULT="" +#GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,57600n8" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console +# Serial console +GRUB_TERMINAL=serial +GRUB_SERIAL_COMMAND="serial --speed=57600 --unit=0 --word=8 --parity=no --stop=1" + + +# 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 + +# 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 diff --git a/config-archive/etc/default/grub.dist b/config-archive/etc/default/grub.dist index 35ab767..593b019 100644 --- a/config-archive/etc/default/grub.dist +++ b/config-archive/etc/default/grub.dist @@ -1,6 +1,5 @@ # 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: diff --git a/config-archive/etc/rc.conf.dist b/config-archive/etc/rc.conf.dist index 68ab997..beafd91 100644 --- a/config-archive/etc/rc.conf.dist +++ b/config-archive/etc/rc.conf.dist @@ -48,7 +48,7 @@ rc_shell=/sbin/sulogin # /var/log/rc.log # NOTE: Linux systems require the devfs service to be started before # logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="YES" +#rc_logger="NO" # Through rc_log_path you can specify a custom log file. # The default value is: /var/log/rc.log @@ -178,6 +178,11 @@ unicode="YES" # "xenU" - XenU Domain (Linux and NetBSD) #rc_sys="" +# if you use openrc-init, which is currently only available on Linux, +# this is the default runlevel to activate after "sysinit" and "boot" +# when booting. +#rc_default_runlevel="default" + # on Linux and Hurd, this is the number of ttys allocated for logins # It is used in the consolefont, keymaps, numlock and termencoding # service scripts. diff --git a/config-archive/etc/rc.conf.dist.new b/config-archive/etc/rc.conf.dist.new deleted file mode 100644 index c0467e0..0000000 --- a/config-archive/etc/rc.conf.dist.new +++ /dev/null @@ -1,250 +0,0 @@ -# Global OpenRC configuration settings - -# Set to "YES" if you want the rc system to try and start services -# in parallel for a slight speed improvement. When running in parallel we -# prefix the service output with its name as the output will get -# jumbled up. -# WARNING: whilst we have improved parallel, it can still potentially lock -# the boot process. Don't file bugs about this unless you can supply -# patches that fix it without breaking other things! -#rc_parallel="NO" - -# Set rc_interactive to "YES" and you'll be able to press the I key during -# boot so you can choose to start specific services. Set to "NO" to disable -# this feature. This feature is automatically disabled if rc_parallel is -# set to YES. -#rc_interactive="YES" - -# If we need to drop to a shell, you can specify it here. -# If not specified we use $SHELL, otherwise the one specified in /etc/passwd, -# otherwise /bin/sh -# Linux users could specify /sbin/sulogin -rc_shell=/sbin/sulogin - -# Do we allow any started service in the runlevel to satisfy the dependency -# or do we want all of them regardless of state? For example, if net.eth0 -# and net.eth1 are in the default runlevel then with rc_depend_strict="NO" -# both will be started, but services that depend on 'net' will work if either -# one comes up. With rc_depend_strict="YES" we would require them both to -# come up. -#rc_depend_strict="YES" - -# rc_hotplug controls which services we allow to be hotplugged. -# A hotplugged service is one started by a dynamic dev manager when a matching -# hardware device is found. -# Hotplugged services appear in the "hotplugged" runlevel. -# If rc_hotplug is set to any value, we compare the name of this service -# to every pattern in the value, from left to right, and we allow the -# service to be hotplugged if it matches a pattern, or if it matches no -# patterns. Patterns can include shell wildcards. -# To disable services from being hotplugged, prefix patterns with "!". -#If rc_hotplug is not set or is empty, all hotplugging is disabled. -# Example - rc_hotplug="net.wlan !net.*" -# This allows net.wlan and any service not matching net.* to be hotplugged. -# Example - rc_hotplug="!net.*" -# This allows services that do not match "net.*" to be hotplugged. - -# rc_logger launches a logging daemon to log the entire rc process to -# /var/log/rc.log -# NOTE: Linux systems require the devfs service to be started before -# logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="NO" - -# Through rc_log_path you can specify a custom log file. -# The default value is: /var/log/rc.log -#rc_log_path="/var/log/rc.log" - -# If you want verbose output for OpenRC, set this to yes. If you want -# verbose output for service foo only, set it to yes in /etc/conf.d/foo. -#rc_verbose=no - -# By default we filter the environment for our running scripts. To allow other -# variables through, add them here. Use a * to allow all variables through. -#rc_env_allow="VAR1 VAR2" - -# By default we assume that all daemons will start correctly. -# However, some do not - a classic example is that they fork and return 0 AND -# then child barfs on a configuration error. Or the daemon has a bug and the -# child crashes. You can set the number of milliseconds start-stop-daemon -# waits to check that the daemon is still running after starting here. -# The default is 0 - no checking. -#rc_start_wait=100 - -# rc_nostop is a list of services which will not stop when changing runlevels. -# This still allows the service itself to be stopped when called directly. -#rc_nostop="" - -# rc will attempt to start crashed services by default. -# However, it will not stop them by default as that could bring down other -# critical services. -#rc_crashed_stop=NO -#rc_crashed_start=YES - -# Set rc_nocolor to yes if you do not want colors displayed in OpenRC -# output. -#rc_nocolor=NO - -############################################################################## -# MISC CONFIGURATION VARIABLES -# There variables are shared between many init scripts - -# Set unicode to YES to turn on unicode support for keyboards and screens. -unicode="YES" - -# This is how long fuser should wait for a remote server to respond. The -# default is 60 seconds, but it can be adjusted here. -#rc_fuser_timeout=60 - -# Below is the default list of network fstypes. -# -# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs -# nfs nfs4 ocfs2 shfs smbfs -# -# If you would like to add to this list, you can do so by adding your -# own fstypes to the following variable. -#extra_net_fs_list="" - -############################################################################## -# SERVICE CONFIGURATION VARIABLES -# These variables are documented here, but should be configured in -# /etc/conf.d/foo for service foo and NOT enabled here unless you -# really want them to work on a global basis. -# If your service has characters in its name which are not legal in -# shell variable names and you configure the variables for it in this -# file, those characters should be replaced with underscores in the -# variable names as shown below. - -# Some daemons are started and stopped via start-stop-daemon. -# We can set some things on a per service basis, like the nicelevel. -#SSD_NICELEVEL="-19" -# Or the ionice level. The format is class[:data] , just like the -# --ionice start-stop-daemon parameter. -#SSD_IONICELEVEL="2:2" - -# Pass ulimit parameters -# If you are using bash in POSIX mode for your shell, note that the -# ulimit command uses a block size of 512 bytes for the -c and -f -# options -#rc_ulimit="-u 30" - -# It's possible to define extra dependencies for services like so -#rc_config="/etc/foo" -#rc_need="openvpn" -#rc_use="net.eth0" -#rc_after="clock" -#rc_before="local" -#rc_provide="!net" - -# You can also enable the above commands here for each service. Below is an -# example for service foo. -#rc_foo_config="/etc/foo" -#rc_foo_need="openvpn" -#rc_foo_after="clock" - -# Below is an example for service foo-bar. Note that the '-' is illegal -# in a shell variable name, so we convert it to an underscore. -# example for service foo-bar. -#rc_foo_bar_config="/etc/foo-bar" -#rc_foo_bar_need="openvpn" -#rc_foo_bar_after="clock" - -# You can also remove dependencies. -# This is mainly used for saying which services do NOT provide net. -#rc_net_tap0_provide="!net" - -# This is the subsystem type. -# It is used to match against keywords set by the keyword call in the -# depend function of service scripts. -# -# It should be set to the value representing the environment this file is -# PRESENTLY in, not the virtualization the environment is capable of. -# If it is commented out, automatic detection will be used. -# -# The list below shows all possible settings as well as the host -# operating systems where they can be used and autodetected. -# -# "" - nothing special -# "docker" - Docker container manager (Linux) -# "jail" - Jail (DragonflyBSD or FreeBSD) -# "lxc" - Linux Containers -# "openvz" - Linux OpenVZ -# "prefix" - Prefix -# "rkt" - CoreOS container management system (Linux) -# "subhurd" - Hurd subhurds (to be checked) -# "systemd-nspawn" - Container created by systemd-nspawn (Linux) -# "uml" - Usermode Linux -# "vserver" - Linux vserver -# "xen0" - Xen0 Domain (Linux and NetBSD) -# "xenU" - XenU Domain (Linux and NetBSD) -#rc_sys="" - -# on Linux and Hurd, this is the number of ttys allocated for logins -# It is used in the consolefont, keymaps, numlock and termencoding -# service scripts. -rc_tty_number=12 - -############################################################################## -# LINUX CGROUPS RESOURCE MANAGEMENT - -# If you have cgroups turned on in your kernel, this switch controls -# whether or not a group for each controller is mounted under -# /sys/fs/cgroup. -# None of the other options in this section work if this is set to "NO". -#rc_controller_cgroups="YES" - -# The following settings allow you to set up values for the cgroup -# controllers for your services. -# They can be set in this file;, however, if you do this, the settings -# will apply to all of your services. -# If you want different settings for each service, place the settings in -# /etc/conf.d/foo for service foo. -# The format is to specify the names of the settings followed by their -# values. Each variable can hold multiple settings. -# For example, you would use this to set the cpu.shares setting in the -# cpu controller to 512 for your service. -# rc_cgroup_cpu=" -# cpu.shares 512 -# " -# -#For more information about the adjustments that can be made with -#cgroups, see Documentation/cgroups/* in the linux kernel source tree. - -# Set the blkio controller settings for this service. -#rc_cgroup_blkio="" - -# Set the cpu controller settings for this service. -#rc_cgroup_cpu="" - -# Add this service to the cpuacct controller (any value means yes). -#rc_cgroup_cpuacct="" - -# Set the cpuset controller settings for this service. -#rc_cgroup_cpuset="" - -# Set the devices controller settings for this service. -#rc_cgroup_devices="" - -# Set the hugetlb controller settings for this service. -#rc_cgroup_hugetlb="" - -# Set the memory controller settings for this service. -#rc_cgroup_memory="" - -# Set the net_cls controller settings for this service. -#rc_cgroup_net_cls="" - -# Set the net_prio controller settings for this service. -#rc_cgroup_net_prio="" - -# Set the pids controller settings for this service. -#rc_cgroup_pids="" - -# Set this to YES if you want all of the processes in a service's cgroup -# killed when the service is stopped or restarted. -# This should not be set globally because it kills all of the service's -# child processes, and most of the time this is undesirable. Please set -# it in /etc/conf.d/. -# To perform this cleanup manually for a stopped service, you can -# execute cgroup_cleanup with /etc/init.d/ cgroup_cleanup or -# rc-service cgroup_cleanup. -# rc_cgroup_cleanup="NO" diff --git a/default/grub b/default/grub index 3150091..accc1ed 100644 --- a/default/grub +++ b/default/grub @@ -1,6 +1,5 @@ # 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: diff --git a/rc.conf b/rc.conf index 58bf2d7..d57e47d 100644 --- a/rc.conf +++ b/rc.conf @@ -176,8 +176,14 @@ unicode="YES" # "vserver" - Linux vserver # "xen0" - Xen0 Domain (Linux and NetBSD) # "xenU" - XenU Domain (Linux and NetBSD) +#rc_sys="" rc_sys="" +# if you use openrc-init, which is currently only available on Linux, +# this is the default runlevel to activate after "sysinit" and "boot" +# when booting. +#rc_default_runlevel="default" + # on Linux and Hurd, this is the number of ttys allocated for logins # It is used in the consolefont, keymaps, numlock and termencoding # service scripts. -- 2.39.5