From 4c735a430f17932ac23f4896f05bdabdb3e56072 Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 30 May 2012 18:51:06 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- config-archive/etc/init.d/radvd | 66 +++++++++++++++++++ .../etc/init.d/radvd.dist | 0 .../savedconfig/sys-apps/busybox-1.19.3-r1 | 2 +- .../savedconfig/sys-apps/busybox-1.19.3-r1.1 | 2 +- .../sys-apps/busybox-1.19.3-r1.dist | 2 +- config-archive/etc/request-key.conf | 37 +++++++++++ .../etc/request-key.conf.dist | 0 init.d/radvd | 6 +- .../savedconfig/sys-apps/busybox-1.19.3-r1 | 2 +- request-key.conf | 4 ++ 10 files changed, 114 insertions(+), 7 deletions(-) create mode 100755 config-archive/etc/init.d/radvd rename init.d/._cfg0000_radvd => config-archive/etc/init.d/radvd.dist (100%) rename portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 => config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 (99%) create mode 100644 config-archive/etc/request-key.conf rename ._cfg0000_request-key.conf => config-archive/etc/request-key.conf.dist (100%) diff --git a/config-archive/etc/init.d/radvd b/config-archive/etc/init.d/radvd new file mode 100755 index 00000000..5a8fedf7 --- /dev/null +++ b/config-archive/etc/init.d/radvd @@ -0,0 +1,66 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd.init,v 1.6 2011/12/04 10:14:13 swegener Exp $ + +CONFIGFILE=/etc/radvd.conf +PIDFILE=/var/run/radvd/radvd.pid +SYSCTL_FORWARD=net.ipv6.conf.all.forwarding + +extra_started_commands="reload" + +depend() { + need net +} + +checkconfig() { + if [ ! -f "${CONFIGFILE}" ]; then + eerror "Configuration file ${CONFIGFILE} not found" + return 1 + fi + + checkpath -d -o radvd:radvd ${PIDFILE%/*} +} + +start() { + checkconfig || return 1 + + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + ebegin "Starting IPv6 Router Advertisement Daemon" + start-stop-daemon --start --exec /usr/sbin/radvd \ + --pidfile "${PIDFILE}" \ + -- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS} + eend $? +} + +stop() { + ebegin "Stopping IPv6 Router Advertisement Daemon" + start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? + + if [ "${FORWARD}" != "no" ]; then + ebegin "Disabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null + eend $? + fi +} + +reload() { + checkconfig || return 1 + + if [ "${FORWARD}" != "no" ]; then + ebegin "Enabling IPv6 forwarding" + sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null + eend $? + fi + + ebegin "Reloading IPv6 Router Advertisement Daemon" + start-stop-daemon --stop --signal HUP --oknodo \ + --exec /usr/sbin/radvd --pidfile "${PIDFILE}" + eend $? +} diff --git a/init.d/._cfg0000_radvd b/config-archive/etc/init.d/radvd.dist similarity index 100% rename from init.d/._cfg0000_radvd rename to config-archive/etc/init.d/radvd.dist diff --git a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 index 3f12463c..aa54b372 100644 --- a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Thu Jan 12 11:22:34 2012 +# Mon Jan 16 13:01:34 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 similarity index 99% rename from portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 rename to config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 index f2427f1d..3f12463c 100644 --- a/portage/savedconfig/sys-apps/._cfg0000_busybox-1.19.3-r1 +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Wed May 30 18:39:53 2012 +# Thu Jan 12 11:22:34 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist index aa54b372..f2427f1d 100644 --- a/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist +++ b/config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Mon Jan 16 13:01:34 2012 +# Wed May 30 18:39:53 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/config-archive/etc/request-key.conf b/config-archive/etc/request-key.conf new file mode 100644 index 00000000..e482c96e --- /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/._cfg0000_request-key.conf b/config-archive/etc/request-key.conf.dist similarity index 100% rename from ._cfg0000_request-key.conf rename to config-archive/etc/request-key.conf.dist diff --git a/init.d/radvd b/init.d/radvd index 5a8fedf7..ce8c8254 100755 --- a/init.d/radvd +++ b/init.d/radvd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd.init,v 1.6 2011/12/04 10:14:13 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-1.8.5.init,v 1.1 2012/05/29 13:38:53 xmw Exp $ CONFIGFILE=/etc/radvd.conf PIDFILE=/var/run/radvd/radvd.pid @@ -60,7 +60,7 @@ reload() { fi ebegin "Reloading IPv6 Router Advertisement Daemon" - start-stop-daemon --stop --signal HUP --oknodo \ + start-stop-daemon --signal HUP \ --exec /usr/sbin/radvd --pidfile "${PIDFILE}" eend $? } diff --git a/portage/savedconfig/sys-apps/busybox-1.19.3-r1 b/portage/savedconfig/sys-apps/busybox-1.19.3-r1 index aa54b372..f2427f1d 100644 --- a/portage/savedconfig/sys-apps/busybox-1.19.3-r1 +++ b/portage/savedconfig/sys-apps/busybox-1.19.3-r1 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.19.3 -# Mon Jan 16 13:01:34 2012 +# Wed May 30 18:39:53 2012 # CONFIG_HAVE_DOT_CONFIG=y diff --git a/request-key.conf b/request-key.conf index e482c96e..ff16a950 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 -- 2.39.5