From: frank Date: Wed, 30 May 2012 20:35:31 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=18a3f17899c26b295fb3229a05c33cf27a37c547;p=config%2Fuhu1%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/._cfg0000_profile b/._cfg0000_profile deleted file mode 100644 index 2dee463..0000000 --- a/._cfg0000_profile +++ /dev/null @@ -1,63 +0,0 @@ -# /etc/profile: login shell setup -# -# That this file is used by any Bourne-shell derivative to setup the -# environment for login shells. -# - -# Load environment settings from profile.env, which is created by -# env-update from the files in /etc/env.d -if [ -e /etc/profile.env ] ; then - . /etc/profile.env -fi - -# You should override these in your ~/.bashrc (or equivalent) for per-user -# settings. For system defaults, you can add a new file in /etc/profile.d/. -export EDITOR=${EDITOR:-/bin/nano} -export PAGER=${PAGER:-/usr/bin/less} - -# 077 would be more secure, but 022 is generally quite realistic -umask 022 - -# Set up PATH depending on whether we're root or a normal user. -# There's no real reason to exclude sbin paths from the normal user, -# but it can make tab-completion easier when they aren't in the -# user's PATH to pollute the executable namespace. -# -# It is intentional in the following line to use || instead of -o. -# This way the evaluation can be short-circuited and calling whoami is -# avoided. -if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" -else - PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" -fi -export PATH -unset ROOTPATH - -if [ -n "${BASH_VERSION}" ] ; then - # Newer bash ebuilds include /etc/bash/bashrc which will setup PS1 - # including color. We leave out color here because not all - # terminals support it. - if [ -f /etc/bash/bashrc ] ; then - # Bash login shells run only /etc/profile - # Bash non-login shells run only /etc/bash/bashrc - # Since we want to run /etc/bash/bashrc regardless, we source it - # from here. It is unfortunate that there is no way to do - # this *after* the user's .bash_profile runs (without putting - # it in the user's dot-files), but it shouldn't make any - # difference. - . /etc/bash/bashrc - else - PS1='\u@\h \w \$ ' - fi -else - # Setup a bland default prompt. Since this prompt should be useable - # on color and non-color terminals, as well as shells that don't - # understand sequences such as \h, don't put anything special in it. - PS1="${USER:-$(whoami 2>/dev/null)}@$(uname -n 2>/dev/null) \$ " -fi - -for sh in /etc/profile.d/*.sh ; do - [ -r "$sh" ] && . "$sh" -done -unset sh diff --git a/._cfg0000_request-key.conf b/._cfg0000_request-key.conf deleted file mode 100644 index ff16a95..0000000 --- a/._cfg0000_request-key.conf +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# -# Copyright (C) 2005 Red Hat, Inc. All Rights Reserved. -# Written by David Howells (dhowells@redhat.com) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version -# 2 of the License, or (at your option) any later version. -# -############################################################################### - - -############################################################################### -# -# We can run programs or scripts -# - Macro substitutions in arguments: -# %%... %... -# %o operation name -# %k ID of key being operated upon -# %t type of key being operated upon -# %d description of key being operated upon -# %c callout info -# %u UID of requestor -# %g GID of requestor -# %T thread keyring of requestor (may be 0) -# %P process keyring of requestor (may be 0) -# %S session keyring of requestor (may be the user's default session) -# -################################################################################ - -#OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... -#====== ======= =============== =============== =============================== -create dns_resolver * * /sbin/key.dns_resolver %k -create user debug:* negate /bin/keyctl negate %k 30 %S -create user debug:* rejected /bin/keyctl reject %k 30 %c %S -create user debug:* expired /bin/keyctl reject %k 30 %c %S -create user debug:* revoked /bin/keyctl reject %k 30 %c %S -create user debug:loop:* * |/bin/cat -create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S -negate * * * /bin/keyctl negate %k 30 %S diff --git a/.etckeeper b/.etckeeper index 3750ba5..a029045 100755 --- a/.etckeeper +++ b/.etckeeper @@ -23,8 +23,6 @@ mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' -maybe chmod 0644 './._cfg0000_profile' -maybe chmod 0644 './._cfg0000_request-key.conf' maybe chmod 0700 './.etckeeper' maybe chmod 0644 './.gitignore' maybe chmod 0600 './.pwd.lock' @@ -451,8 +449,12 @@ maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19 maybe chmod 0755 './config-archive/etc/postfix' maybe chmod 0644 './config-archive/etc/postfix/main.cf' maybe chmod 0644 './config-archive/etc/postfix/main.cf.dist' +maybe chmod 0644 './config-archive/etc/profile' +maybe chmod 0644 './config-archive/etc/profile.dist' maybe chmod 0644 './config-archive/etc/rc.conf' maybe chmod 0644 './config-archive/etc/rc.conf.dist.new' +maybe chmod 0644 './config-archive/etc/request-key.conf' +maybe chmod 0644 './config-archive/etc/request-key.conf.dist' maybe chmod 0644 './config-archive/etc/screenrc' maybe chmod 0644 './config-archive/etc/screenrc.dist.new' maybe chmod 0755 './config-archive/etc/skel' diff --git a/config-archive/etc/profile b/config-archive/etc/profile new file mode 100644 index 0000000..3565bab --- /dev/null +++ b/config-archive/etc/profile @@ -0,0 +1,63 @@ +# /etc/profile: login shell setup +# +# That this file is used by any Bourne-shell derivative to setup the +# environment for login shells. +# + +# Load environment settings from profile.env, which is created by +# env-update from the files in /etc/env.d +if [ -e /etc/profile.env ] ; then + . /etc/profile.env +fi + +# You should override these in your ~/.bashrc (or equivalent) for per-user +# settings. For system defaults, you can add a new file in /etc/profile.d/. +export EDITOR=${EDITOR:-/bin/nano} +export PAGER=${PAGER:-/usr/bin/less} + +# 077 would be more secure, but 022 is generally quite realistic +umask 022 + +# Set up PATH depending on whether we're root or a normal user. +# There's no real reason to exclude sbin paths from the normal user, +# but it can make tab-completion easier when they aren't in the +# user's PATH to pollute the executable namespace. +# +# It is intentional in the following line to use || instead of -o. +# This way the evaluation can be short-circuited and calling whoami is +# avoided. +if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" +else + PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" +fi +export PATH +unset ROOTPATH + +if [ -n "${BASH_VERSION}" ] ; then + # Newer bash ebuilds include /etc/bash/bashrc which will setup PS1 + # including color. We leave out color here because not all + # terminals support it. + if [ -f /etc/bash/bashrc ] ; then + # Bash login shells run only /etc/profile + # Bash non-login shells run only /etc/bash/bashrc + # Since we want to run /etc/bash/bashrc regardless, we source it + # from here. It is unfortunate that there is no way to do + # this *after* the user's .bash_profile runs (without putting + # it in the user's dot-files), but it shouldn't make any + # difference. + . /etc/bash/bashrc + else + PS1='\u@\h \w \$ ' + fi +else + # Setup a bland default prompt. Since this prompt should be useable + # on color and non-color terminals, as well as shells that don't + # understand sequences such as \h, don't put anything special in it. + PS1="${USER:-$(type whoami >/dev/null && whoami)}@$(type uname >/dev/null && uname -n) \$ " +fi + +for sh in /etc/profile.d/*.sh ; do + [ -r "$sh" ] && . "$sh" +done +unset sh diff --git a/config-archive/etc/profile.dist b/config-archive/etc/profile.dist new file mode 100644 index 0000000..2dee463 --- /dev/null +++ b/config-archive/etc/profile.dist @@ -0,0 +1,63 @@ +# /etc/profile: login shell setup +# +# That this file is used by any Bourne-shell derivative to setup the +# environment for login shells. +# + +# Load environment settings from profile.env, which is created by +# env-update from the files in /etc/env.d +if [ -e /etc/profile.env ] ; then + . /etc/profile.env +fi + +# You should override these in your ~/.bashrc (or equivalent) for per-user +# settings. For system defaults, you can add a new file in /etc/profile.d/. +export EDITOR=${EDITOR:-/bin/nano} +export PAGER=${PAGER:-/usr/bin/less} + +# 077 would be more secure, but 022 is generally quite realistic +umask 022 + +# Set up PATH depending on whether we're root or a normal user. +# There's no real reason to exclude sbin paths from the normal user, +# but it can make tab-completion easier when they aren't in the +# user's PATH to pollute the executable namespace. +# +# It is intentional in the following line to use || instead of -o. +# This way the evaluation can be short-circuited and calling whoami is +# avoided. +if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" +else + PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" +fi +export PATH +unset ROOTPATH + +if [ -n "${BASH_VERSION}" ] ; then + # Newer bash ebuilds include /etc/bash/bashrc which will setup PS1 + # including color. We leave out color here because not all + # terminals support it. + if [ -f /etc/bash/bashrc ] ; then + # Bash login shells run only /etc/profile + # Bash non-login shells run only /etc/bash/bashrc + # Since we want to run /etc/bash/bashrc regardless, we source it + # from here. It is unfortunate that there is no way to do + # this *after* the user's .bash_profile runs (without putting + # it in the user's dot-files), but it shouldn't make any + # difference. + . /etc/bash/bashrc + else + PS1='\u@\h \w \$ ' + fi +else + # Setup a bland default prompt. Since this prompt should be useable + # on color and non-color terminals, as well as shells that don't + # understand sequences such as \h, don't put anything special in it. + PS1="${USER:-$(whoami 2>/dev/null)}@$(uname -n 2>/dev/null) \$ " +fi + +for sh in /etc/profile.d/*.sh ; do + [ -r "$sh" ] && . "$sh" +done +unset sh diff --git a/config-archive/etc/request-key.conf b/config-archive/etc/request-key.conf new file mode 100644 index 0000000..e482c96 --- /dev/null +++ b/config-archive/etc/request-key.conf @@ -0,0 +1,37 @@ +############################################################################### +# +# Copyright (C) 2005 Red Hat, Inc. All Rights Reserved. +# Written by David Howells (dhowells@redhat.com) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# +############################################################################### + + +############################################################################### +# +# We can run programs or scripts +# - Macro substitutions in arguments: +# %%... %... +# %o operation name +# %k ID of key being operated upon +# %t type of key being operated upon +# %d description of key being operated upon +# %c callout info +# %u UID of requestor +# %g GID of requestor +# %T thread keyring of requestor (may be 0) +# %P process keyring of requestor (may be 0) +# %S session keyring of requestor (may be the user's default session) +# +################################################################################ + +#OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... +#====== ======= =============== =============== =============================== +create user debug:* negate /bin/keyctl negate %k 30 %S +create user debug:loop:* * |/bin/cat +create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +negate * * * /bin/keyctl negate %k 30 %S diff --git a/config-archive/etc/request-key.conf.dist b/config-archive/etc/request-key.conf.dist new file mode 100644 index 0000000..ff16a95 --- /dev/null +++ b/config-archive/etc/request-key.conf.dist @@ -0,0 +1,41 @@ +############################################################################### +# +# Copyright (C) 2005 Red Hat, Inc. All Rights Reserved. +# Written by David Howells (dhowells@redhat.com) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version +# 2 of the License, or (at your option) any later version. +# +############################################################################### + + +############################################################################### +# +# We can run programs or scripts +# - Macro substitutions in arguments: +# %%... %... +# %o operation name +# %k ID of key being operated upon +# %t type of key being operated upon +# %d description of key being operated upon +# %c callout info +# %u UID of requestor +# %g GID of requestor +# %T thread keyring of requestor (may be 0) +# %P process keyring of requestor (may be 0) +# %S session keyring of requestor (may be the user's default session) +# +################################################################################ + +#OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... +#====== ======= =============== =============== =============================== +create dns_resolver * * /sbin/key.dns_resolver %k +create user debug:* negate /bin/keyctl negate %k 30 %S +create user debug:* rejected /bin/keyctl reject %k 30 %c %S +create user debug:* expired /bin/keyctl reject %k 30 %c %S +create user debug:* revoked /bin/keyctl reject %k 30 %c %S +create user debug:loop:* * |/bin/cat +create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S +negate * * * /bin/keyctl negate %k 30 %S diff --git a/profile b/profile index 3565bab..2dee463 100644 --- a/profile +++ b/profile @@ -54,7 +54,7 @@ else # Setup a bland default prompt. Since this prompt should be useable # on color and non-color terminals, as well as shells that don't # understand sequences such as \h, don't put anything special in it. - PS1="${USER:-$(type whoami >/dev/null && whoami)}@$(type uname >/dev/null && uname -n) \$ " + PS1="${USER:-$(whoami 2>/dev/null)}@$(uname -n 2>/dev/null) \$ " fi for sh in /etc/profile.d/*.sh ; do diff --git a/request-key.conf b/request-key.conf index e482c96..ff16a95 100644 --- a/request-key.conf +++ b/request-key.conf @@ -31,7 +31,11 @@ #OP TYPE DESCRIPTION CALLOUT INFO PROGRAM ARG1 ARG2 ARG3 ... #====== ======= =============== =============== =============================== +create dns_resolver * * /sbin/key.dns_resolver %k create user debug:* negate /bin/keyctl negate %k 30 %S +create user debug:* rejected /bin/keyctl reject %k 30 %c %S +create user debug:* expired /bin/keyctl reject %k 30 %c %S +create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S negate * * * /bin/keyctl negate %k 30 %S