From ccfaafb7368385904c4e8407cab268f9c66538e0 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 16 Jan 2012 18:19:21 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 7 +- config-archive/etc/dispatch-conf.conf | 65 +++++++++ .../etc/dispatch-conf.conf.dist.new | 0 config-archive/etc/pulse/default.pa | 137 ++++++++++++++++++ .../etc/pulse/default.pa.dist | 0 pulse/default.pa | 2 +- 6 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 config-archive/etc/dispatch-conf.conf rename ._cfg0000_dispatch-conf.conf => config-archive/etc/dispatch-conf.conf.dist.new (100%) create mode 100644 config-archive/etc/pulse/default.pa rename pulse/._cfg0000_default.pa => config-archive/etc/pulse/default.pa.dist (100%) diff --git a/.etckeeper b/.etckeeper index 3579ce96..95ecaba3 100755 --- a/.etckeeper +++ b/.etckeeper @@ -29,7 +29,6 @@ mkdir -p './texmf/dvipdfm/config' mkdir -p './texmf/dvips.d' mkdir -p './unixODBC/ODBCDataSources' maybe chmod 0755 '.' -maybe chmod 0644 './._cfg0000_dispatch-conf.conf' maybe chmod 0700 './.etckeeper' maybe chmod 0644 './.gitignore' maybe chmod 0600 './.pwd.lock' @@ -192,6 +191,8 @@ maybe chmod 0644 './config-archive/etc/bash/bashrc.dist.new' maybe chmod 0755 './config-archive/etc/conf.d' maybe chmod 0644 './config-archive/etc/conf.d/ntpd' maybe chmod 0644 './config-archive/etc/conf.d/ntpd.dist.new' +maybe chmod 0644 './config-archive/etc/dispatch-conf.conf' +maybe chmod 0644 './config-archive/etc/dispatch-conf.conf.dist.new' maybe chmod 0755 './config-archive/etc/etckeeper' maybe chmod 0644 './config-archive/etc/etckeeper/etckeeper.conf' maybe chmod 0644 './config-archive/etc/etckeeper/etckeeper.conf.dist.new' @@ -209,6 +210,9 @@ maybe chmod 0755 './config-archive/etc/portage/savedconfig' maybe chmod 0755 './config-archive/etc/portage/savedconfig/sys-apps' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1' maybe chmod 0644 './config-archive/etc/portage/savedconfig/sys-apps/busybox-1.19.3-r1.dist' +maybe chmod 0755 './config-archive/etc/pulse' +maybe chmod 0644 './config-archive/etc/pulse/default.pa' +maybe chmod 0644 './config-archive/etc/pulse/default.pa.dist' maybe chmod 0755 './config-archive/etc/ssh' maybe chmod 0644 './config-archive/etc/ssh/ssh_config' maybe chmod 0644 './config-archive/etc/ssh/ssh_config.dist' @@ -856,7 +860,6 @@ maybe chmod 0644 './profile.d/java-config-2.sh' maybe chmod 0644 './profile.env' maybe chmod 0644 './protocols' maybe chmod 0755 './pulse' -maybe chmod 0644 './pulse/._cfg0000_default.pa' maybe chmod 0644 './pulse/client.conf' maybe chmod 0644 './pulse/daemon.conf' maybe chmod 0644 './pulse/default.pa' diff --git a/config-archive/etc/dispatch-conf.conf b/config-archive/etc/dispatch-conf.conf new file mode 100644 index 00000000..12e3eb16 --- /dev/null +++ b/config-archive/etc/dispatch-conf.conf @@ -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? +# 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-AT-EOF" + +# 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=yes + +# Automerge files that the user hasn't modified +# (yes or no) +replace-unmodified=yes + +# 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=yes + +# 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/._cfg0000_dispatch-conf.conf b/config-archive/etc/dispatch-conf.conf.dist.new similarity index 100% rename from ._cfg0000_dispatch-conf.conf rename to config-archive/etc/dispatch-conf.conf.dist.new diff --git a/config-archive/etc/pulse/default.pa b/config-archive/etc/pulse/default.pa new file mode 100644 index 00000000..33179fd6 --- /dev/null +++ b/config-archive/etc/pulse/default.pa @@ -0,0 +1,137 @@ +#!/usr/bin/pulseaudio -nF +# +# This file is part of PulseAudio. +# +# PulseAudio is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +# This startup script is used only if PulseAudio is started per-user +# (i.e. not in system mode) + +.nofail + +### Load something into the sample cache +#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav +#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-access /usr/share/sounds/generic.wav + +.fail + +### Automatically restore the volume of streams and devices +load-module module-device-restore +load-module module-stream-restore +load-module module-card-restore + +### Automatically augment property information from .desktop files +### stored in /usr/share/application +load-module module-augment-properties + +### Load audio drivers statically (it's probably better to not load +### these drivers manually, but instead use module-hal-detect -- +### see below -- for doing this automatically) +#load-module module-alsa-sink +#load-module module-alsa-source device=hw:1,0 +#load-module module-oss device="/dev/dsp" sink_name=output source_name=input +#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input +#load-module module-null-sink +#load-module module-pipe-sink + +### Automatically load driver modules depending on the hardware available +.ifexists module-udev-detect.so +load-module module-udev-detect +.else +### Alternatively use the static hardware detection module (for systems that +### lack udev support) +load-module module-detect +.endif + +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-discover.so +load-module module-bluetooth-discover +.endif + +### Load several protocols +.ifexists module-esound-protocol-unix.so +load-module module-esound-protocol-unix +.endif +load-module module-native-protocol-unix + +### Network access (may be configured with paprefs, so leave this commented +### here if you plan to use paprefs) +#load-module module-esound-protocol-tcp +#load-module module-native-protocol-tcp +#load-module module-zeroconf-publish + +### Load the RTP reciever module (also configured via paprefs, see above) +#load-module module-rtp-recv + +### Load the RTP sender module (also configured via paprefs, see above) +#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink" +#load-module module-rtp-send source=rtp.monitor + +### Load additional modules from GConf settings. This can be configured with the paprefs tool. +### Please keep in mind that the modules configured by paprefs might conflict with manually +### loaded modules. +.ifexists module-gconf.so +.nofail +load-module module-gconf +.fail +.endif + +### Automatically restore the default sink/source when changed by the user during runtime +load-module module-default-device-restore + +### Automatically move streams to the default sink if the sink they are +### connected to dies, similar for sources +load-module module-rescue-streams + +### Make sure we always have a sink around, even if it is a null sink. +load-module module-always-sink + +### Honour intended role device property +load-module module-intended-roles + +### Automatically suspend sinks/sources that become idle for too long +load-module module-suspend-on-idle + +### If autoexit on idle is enabled we want to make sure we only quit +### when no local session needs us anymore. +load-module module-console-kit + +### Enable positioned event sounds +load-module module-position-event-sounds + +### Cork music streams when a phone stream is active +load-module module-cork-music-on-phone + +# X11 modules should not be started from default.pa so that one daemon +# can be shared by multiple sessions. + +### Load X11 bell module +#load-module module-x11-bell sample=bell-windowing-system + +### Register ourselves in the X11 session manager +#load-module module-x11-xsmp + +### Publish connection data in the X11 root window +#.ifexists module-x11-publish.so +#.nofail +#load-module module-x11-publish +#.fail +#.endif + +### Make some devices default +#set-default-sink output +#set-default-source input diff --git a/pulse/._cfg0000_default.pa b/config-archive/etc/pulse/default.pa.dist similarity index 100% rename from pulse/._cfg0000_default.pa rename to config-archive/etc/pulse/default.pa.dist diff --git a/pulse/default.pa b/pulse/default.pa index 33179fd6..ea8956e2 100644 --- a/pulse/default.pa +++ b/pulse/default.pa @@ -72,7 +72,7 @@ load-module module-native-protocol-unix ### here if you plan to use paprefs) #load-module module-esound-protocol-tcp #load-module module-native-protocol-tcp -#load-module module-zeroconf-publish +load-module module-zeroconf-publish ### Load the RTP reciever module (also configured via paprefs, see above) #load-module module-rtp-recv -- 2.39.5