saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index dd9fdd4d0ac4a44367041b5a224e2fae9c243300..969abc6520356a3e2d02f5f52d553da5d9739bdc 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -435,6 +435,7 @@ maybe chmod 0644 './env.d/90nss'
 maybe chmod 0644 './env.d/90xdg-data-base'
 maybe chmod 0644 './env.d/98ca-certificates'
 maybe chmod 0644 './env.d/98texlive'
+maybe chmod 0644 './env.d/99editor'
 maybe chmod 0644 './env.d/99fltk-1'
 maybe chmod 0644 './env.d/99gentoolkit-env'
 maybe chmod 0755 './env.d/binutils'

diff --git a/csh.env b/csh.env
index e6f7a986007f98e0872fb7beed9aeec25af78a5a..7e3adafbc5787220ed5c309ced0d88a30b1b23c6 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -5,6 +5,7 @@
 setenv ANT_HOME '/usr/share/ant'
 setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt /usr/share/config /usr/share/openvpn/easy-rsa'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+setenv EDITOR '/usr/bin/vim'
 setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.0/html'
 setenv GCC_SPECS ''
 setenv GDK_USE_XFT '1'
@@ -29,6 +30,7 @@ setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
 setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/'
 setenv OPENGL_PROFILE 'xorg-x11'
+setenv PAGER '/usr/bin/less'
 setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin'
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.1/html/library'

diff --git a/env.d/99editor b/env.d/99editor
new file mode 100644 (file)
index 0000000..8ef3d46
--- /dev/null
+++ b/env.d/99editor
@@ -0,0 +1,2 @@
+EDITOR=/usr/bin/vim
+PAGER=/usr/bin/less

diff --git a/profile.env b/profile.env
index a20456b6943d85818561f385afe5ac469f4422f1..f868c9c8a0e772da5a9c8d29afd4e01ed5dd096f 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -5,6 +5,7 @@
 export ANT_HOME='/usr/share/ant'
 export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt /usr/share/config /usr/share/openvpn/easy-rsa'
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/env.d/java/ /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+export EDITOR='/usr/bin/vim'
 export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.0/html'
 export GCC_SPECS=''
 export GDK_USE_XFT='1'
@@ -29,6 +30,7 @@ export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
 export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/'
 export OPENGL_PROFILE='xorg-x11'
+export PAGER='/usr/bin/less'
 export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin'
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.1/html/library'