From: Frank Brehm Date: Tue, 24 Jan 2017 12:38:40 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=d365d112db01e51a50b56023750c822114e9e0bc;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 8a45d17..ef2935e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -176,6 +176,8 @@ maybe chmod 0644 'config-archive/etc/apache2/vhosts.d/default_vhost.include.dist maybe chmod 0755 'config-archive/etc/conf.d' 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/dispatch-conf.conf' +maybe chmod 0644 'config-archive/etc/dispatch-conf.conf.dist.new' maybe chmod 0644 'config-archive/etc/genkernel.conf' maybe chmod 0644 'config-archive/etc/genkernel.conf.dist' maybe chmod 0644 'config-archive/etc/hosts' diff --git a/config-archive/etc/dispatch-conf.conf b/config-archive/etc/dispatch-conf.conf new file mode 100644 index 0000000..8f4f6a1 --- /dev/null +++ b/config-archive/etc/dispatch-conf.conf @@ -0,0 +1,67 @@ +# +# dispatch-conf.conf +# + +# Directory to archive replaced configs +archive-dir=${EPREFIX}/etc/config-archive + +# Use rcs for storing files in the archive directory? +# NOTE: You should install dev-vcs/rcs before enabling this option. +# WARNING: When configured to use rcs, read and execute permissions of +# archived files may be inherited from the first check in of a working +# file, as documented in the ci(1) man page. This means that even if +# the permissions of the working file have since changed, the older +# permissions of the first check in may be inherited. As mentioned in +# the ci(1) man page, users can control access to RCS files by setting +# the permissions of the directory containing the files (see +# archive-dir above). +# (yes or no) +use-rcs=no + +# Diff for display +# %s old file +# %s new file +# If using colordiff instead of diff, the less -R option may be required +# for correct display. +#diff="diff -Nu '%s' '%s'" +diff="diff -Nu '%s' '%s' | colordiff" + + +# Set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored). +# Setting pager="cat" will disable pager usage. +pager="" + +# Default options used if less is the pager +less-opts="--no-init --quit-if-one-screen" + +# Diff for interactive merges. +# %s output file +# %s old file +# %s new file +merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'" + +# Automerge files comprising only CVS interpolations (e.g. Header or Id) +# (yes or no) +replace-cvs=yes + +# Automerge files comprising only whitespace and/or comments +# (yes or no) +replace-wscomments=no + +# Automerge files that the user hasn't modified +# (yes or no) +replace-unmodified=no + +# Ignore a version that is identical to the previously merged version, +# even though it is different from the current user modified version +# Note that emerge already has a similar feature enabled by default, +# which can be disabled by the emerge --noconfmem option. +# (yes or no) +ignore-previously-merged=no + +# Per-session log file of changes made to configuration files +#log-file=/var/log/dispatch-conf.log + +# List of frozen files for which dispatch-conf will automatically zap updates +#frozen-files="" diff --git a/config-archive/etc/dispatch-conf.conf.dist.new b/config-archive/etc/dispatch-conf.conf.dist.new new file mode 100644 index 0000000..7efce8a --- /dev/null +++ b/config-archive/etc/dispatch-conf.conf.dist.new @@ -0,0 +1,65 @@ +# +# dispatch-conf.conf +# + +# Directory to archive replaced configs +archive-dir=${EPREFIX}/etc/config-archive + +# Use rcs for storing files in the archive directory? +# NOTE: You should install dev-vcs/rcs before enabling this option. +# WARNING: When configured to use rcs, read and execute permissions of +# archived files may be inherited from the first check in of a working +# file, as documented in the ci(1) man page. This means that even if +# the permissions of the working file have since changed, the older +# permissions of the first check in may be inherited. As mentioned in +# the ci(1) man page, users can control access to RCS files by setting +# the permissions of the directory containing the files (see +# archive-dir above). +# (yes or no) +use-rcs=no + +# Diff for display +# %s old file +# %s new file +# If using colordiff instead of diff, the less -R option may be required +# for correct display. +diff="diff -Nu '%s' '%s'" + +# Set the pager for use with diff commands (this will +# cause the PAGER environment variable to be ignored). +# Setting pager="cat" will disable pager usage. +pager="" + +# Default options used if less is the pager +less-opts="--no-init --quit-if-one-screen" + +# Diff for interactive merges. +# %s output file +# %s old file +# %s new file +merge="sdiff --suppress-common-lines --output='%s' '%s' '%s'" + +# Automerge files comprising only CVS interpolations (e.g. Header or Id) +# (yes or no) +replace-cvs=yes + +# Automerge files comprising only whitespace and/or comments +# (yes or no) +replace-wscomments=no + +# Automerge files that the user hasn't modified +# (yes or no) +replace-unmodified=no + +# Ignore a version that is identical to the previously merged version, +# even though it is different from the current user modified version +# Note that emerge already has a similar feature enabled by default, +# which can be disabled by the emerge --noconfmem option. +# (yes or no) +ignore-previously-merged=no + +# Per-session log file of changes made to configuration files +#log-file=/var/log/dispatch-conf.log + +# List of frozen files for which dispatch-conf will automatically zap updates +#frozen-files="" diff --git a/portage/package.use b/portage/package.use index 730b09f..bba586b 100644 --- a/portage/package.use +++ b/portage/package.use @@ -10,6 +10,7 @@ app-arch/cabextract extra-tools app-arch/unzip natspec app-arch/zip natspec +app-editors/nano justify #app-editors/vim -python_targets_python3_3 app-emulation/qemu iscsi static-user