From c32257a60e8187fb31d839e9c6b8420909d0f9a7 Mon Sep 17 00:00:00 2001 From: fbrehm Date: Mon, 12 Mar 2012 18:43:53 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 40 ++- conf.d/alsasound | 7 - conf.d/libvirtd | 4 +- config-archive/etc/conf.d/alsasound | 31 ++ .../etc/conf.d/alsasound.dist | 0 config-archive/etc/conf.d/libvirtd | 37 +++ .../etc/conf.d/libvirtd.dist | 0 config-archive/etc/cups/cups-pdf.conf | 265 ++++++++++++++++++ .../etc/cups/cups-pdf.conf.dist | 0 .../etc/eselect/postgresql/slots/9.1/base | 1 + .../eselect/postgresql/slots/9.1/base.dist | 0 .../etc/eselect/postgresql/slots/9.1/docs | 1 + .../eselect/postgresql/slots/9.1/docs.dist | 0 .../etc/eselect/postgresql/slots/9.1/server | 1 + .../eselect/postgresql/slots/9.1/server.dist | 0 config-archive/etc/init.d/alsasound | 218 ++++++++++++++ .../etc/init.d/alsasound.dist | 0 config-archive/etc/init.d/dbus | 51 ++++ .../etc/init.d/dbus.dist | 0 config-archive/etc/init.d/libvirtd | 125 +++++++++ .../etc/init.d/libvirtd.dist | 0 config-archive/etc/libvirt/lxc.conf | 13 + .../etc/libvirt/lxc.conf.dist | 0 .../etc/libvirt/nwfilter/no-ip-spoofing.xml | 14 + .../libvirt/nwfilter/no-ip-spoofing.xml.dist | 0 cups/cups-pdf.conf | 36 ++- eselect/postgresql/slots/9.1/base | 2 +- eselect/postgresql/slots/9.1/docs | 2 +- eselect/postgresql/slots/9.1/server | 2 +- init.d/alsasound | 147 +--------- init.d/dbus | 5 +- init.d/libvirtd | 66 +++-- libvirt/lxc.conf | 18 ++ libvirt/nwfilter/no-ip-spoofing.xml | 6 +- 34 files changed, 884 insertions(+), 208 deletions(-) create mode 100644 config-archive/etc/conf.d/alsasound rename conf.d/._cfg0000_alsasound => config-archive/etc/conf.d/alsasound.dist (100%) create mode 100644 config-archive/etc/conf.d/libvirtd rename conf.d/._cfg0000_libvirtd => config-archive/etc/conf.d/libvirtd.dist (100%) create mode 100644 config-archive/etc/cups/cups-pdf.conf rename cups/._cfg0000_cups-pdf.conf => config-archive/etc/cups/cups-pdf.conf.dist (100%) create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/base rename eselect/postgresql/slots/9.1/._cfg0000_base => config-archive/etc/eselect/postgresql/slots/9.1/base.dist (100%) create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/docs rename eselect/postgresql/slots/9.1/._cfg0000_docs => config-archive/etc/eselect/postgresql/slots/9.1/docs.dist (100%) create mode 100644 config-archive/etc/eselect/postgresql/slots/9.1/server rename eselect/postgresql/slots/9.1/._cfg0000_server => config-archive/etc/eselect/postgresql/slots/9.1/server.dist (100%) create mode 100755 config-archive/etc/init.d/alsasound rename init.d/._cfg0000_alsasound => config-archive/etc/init.d/alsasound.dist (100%) create mode 100755 config-archive/etc/init.d/dbus rename init.d/._cfg0000_dbus => config-archive/etc/init.d/dbus.dist (100%) create mode 100755 config-archive/etc/init.d/libvirtd rename init.d/._cfg0000_libvirtd => config-archive/etc/init.d/libvirtd.dist (100%) create mode 100644 config-archive/etc/libvirt/lxc.conf rename libvirt/._cfg0000_lxc.conf => config-archive/etc/libvirt/lxc.conf.dist (100%) create mode 100644 config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml rename libvirt/nwfilter/._cfg0000_no-ip-spoofing.xml => config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml.dist (100%) diff --git a/.etckeeper b/.etckeeper index d6d851a..7e94a22 100755 --- a/.etckeeper +++ b/.etckeeper @@ -219,8 +219,6 @@ maybe chmod 0644 './chromium/default' maybe chmod 0644 './colordiffrc' maybe chmod 0644 './colordiffrc-lightbg' maybe chmod 0755 './conf.d' -maybe chmod 0644 './conf.d/._cfg0000_alsasound' -maybe chmod 0644 './conf.d/._cfg0000_libvirtd' maybe chmod 0644 './conf.d/acpid' maybe chmod 0644 './conf.d/alsasound' maybe chmod 0644 './conf.d/apache2' @@ -290,17 +288,46 @@ maybe chmod 0755 './config-archive/etc/bash' maybe chmod 0644 './config-archive/etc/bash/bashrc' 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/alsasound' +maybe chmod 0644 './config-archive/etc/conf.d/alsasound.dist' +maybe chmod 0644 './config-archive/etc/conf.d/libvirtd' +maybe chmod 0644 './config-archive/etc/conf.d/libvirtd.dist' maybe chmod 0644 './config-archive/etc/conf.d/slapd' maybe chmod 0644 './config-archive/etc/conf.d/slapd.dist' maybe chmod 0644 './config-archive/etc/conf.d/xdm' maybe chmod 0644 './config-archive/etc/conf.d/xdm.dist.new' +maybe chmod 0755 './config-archive/etc/cups' +maybe chmod 0644 './config-archive/etc/cups/cups-pdf.conf' +maybe chmod 0644 './config-archive/etc/cups/cups-pdf.conf.dist' +maybe chmod 0755 './config-archive/etc/eselect' +maybe chmod 0755 './config-archive/etc/eselect/postgresql' +maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots' +maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots/9.1' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base.dist' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs.dist' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server' +maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server.dist' maybe chmod 0644 './config-archive/etc/hosts' maybe chmod 0644 './config-archive/etc/hosts.dist.new' maybe chmod 0755 './config-archive/etc/init.d' +maybe chmod 0755 './config-archive/etc/init.d/alsasound' +maybe chmod 0755 './config-archive/etc/init.d/alsasound.dist' +maybe chmod 0755 './config-archive/etc/init.d/dbus' +maybe chmod 0755 './config-archive/etc/init.d/dbus.dist' +maybe chmod 0755 './config-archive/etc/init.d/libvirtd' +maybe chmod 0755 './config-archive/etc/init.d/libvirtd.dist' maybe chmod 0755 './config-archive/etc/init.d/nscd' maybe chmod 0755 './config-archive/etc/init.d/nscd.dist' maybe chmod 0755 './config-archive/etc/init.d/slapd' maybe chmod 0755 './config-archive/etc/init.d/slapd.dist' +maybe chmod 0755 './config-archive/etc/libvirt' +maybe chmod 0644 './config-archive/etc/libvirt/lxc.conf' +maybe chmod 0644 './config-archive/etc/libvirt/lxc.conf.dist' +maybe chmod 0755 './config-archive/etc/libvirt/nwfilter' +maybe chmod 0644 './config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml' +maybe chmod 0644 './config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml.dist' maybe chmod 0644 './config-archive/etc/mke2fs.conf' maybe chmod 0644 './config-archive/etc/mke2fs.conf.dist' maybe chmod 0755 './config-archive/etc/openldap' @@ -442,7 +469,6 @@ maybe chmod 0644 './crontab' maybe chmod 0644 './csh.env' maybe chgrp lp './cups' maybe chmod 0755 './cups' -maybe chmod 0644 './cups/._cfg0000_cups-pdf.conf' maybe chmod 0644 './cups/client.conf' maybe chmod 0644 './cups/command.types' maybe chmod 0644 './cups/cups-pdf.conf' @@ -600,9 +626,6 @@ maybe chmod 0644 './eselect/postgresql/active.links' maybe chmod 0644 './eselect/postgresql/active.links91' maybe chmod 0755 './eselect/postgresql/slots' maybe chmod 0755 './eselect/postgresql/slots/9.1' -maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_base' -maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_docs' -maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_server' maybe chmod 0644 './eselect/postgresql/slots/9.1/base' maybe chmod 0644 './eselect/postgresql/slots/9.1/docs' maybe chmod 0644 './eselect/postgresql/slots/9.1/server' @@ -930,9 +953,6 @@ maybe chmod 0644 './imlib/im_palette-tiny.pal' maybe chmod 0644 './imlib/im_palette.pal' maybe chmod 0644 './imlib/imrc' maybe chmod 0755 './init.d' -maybe chmod 0755 './init.d/._cfg0000_alsasound' -maybe chmod 0755 './init.d/._cfg0000_dbus' -maybe chmod 0755 './init.d/._cfg0000_libvirtd' maybe chmod 0755 './init.d/NetworkManager' maybe chmod 0755 './init.d/acpid' maybe chmod 0755 './init.d/aiccu' @@ -1091,12 +1111,10 @@ maybe chmod 0755 './lftp' maybe chmod 0644 './lftp/lftp.conf' maybe chmod 0640 './libaudit.conf' maybe chmod 0755 './libvirt' -maybe chmod 0644 './libvirt/._cfg0000_lxc.conf' maybe chmod 0644 './libvirt/libvirt.conf' maybe chmod 0644 './libvirt/libvirtd.conf' maybe chmod 0644 './libvirt/lxc.conf' maybe chmod 0755 './libvirt/nwfilter' -maybe chmod 0644 './libvirt/nwfilter/._cfg0000_no-ip-spoofing.xml' maybe chmod 0644 './libvirt/nwfilter/allow-arp.xml' maybe chmod 0644 './libvirt/nwfilter/allow-dhcp-server.xml' maybe chmod 0644 './libvirt/nwfilter/allow-dhcp.xml' diff --git a/conf.d/alsasound b/conf.d/alsasound index 0a5d58f..b2c41fe 100644 --- a/conf.d/alsasound +++ b/conf.d/alsasound @@ -1,10 +1,3 @@ -# ENABLE_OSS_EMUL: -# Do you want to enable in-kernel oss emulation? -# no - Do not load oss emul drivers -# yes - Load oss emul drivers if they're found - -ENABLE_OSS_EMUL="yes" - # RESTORE_ON_START: # Do you want to restore your mixer settings? If not, your cards will be # muted. diff --git a/conf.d/libvirtd b/conf.d/libvirtd index 9040157..d2634bd 100644 --- a/conf.d/libvirtd +++ b/conf.d/libvirtd @@ -27,11 +27,11 @@ LIBVIRTD_KVM_SHUTDOWN="managedsave" # remaining VM's still in a running state #LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500" -# LIBVIRTD_NET_SHUTDOWN +# LIBVIRTD_KVM_NET_SHUTDOWN # If libvirtd created networks for you (e.g. NATed networks) then this init # script will shut them down for you if this is set to 'yes'. Otherwise, # the networks will be left running once libvirt is shutdown. For this # option to be useful you must have enabled the 'virt-network' USE flag and # have had libvirt create a NATed network for you. # Valid values: 'yes' or 'no' -#LIBVIRTD_NET_SHUTDOWN="yes" +#LIBVIRTD_KVM_NET_SHUTDOWN="yes" diff --git a/config-archive/etc/conf.d/alsasound b/config-archive/etc/conf.d/alsasound new file mode 100644 index 0000000..0a5d58f --- /dev/null +++ b/config-archive/etc/conf.d/alsasound @@ -0,0 +1,31 @@ +# ENABLE_OSS_EMUL: +# Do you want to enable in-kernel oss emulation? +# no - Do not load oss emul drivers +# yes - Load oss emul drivers if they're found + +ENABLE_OSS_EMUL="yes" + +# RESTORE_ON_START: +# Do you want to restore your mixer settings? If not, your cards will be +# muted. +# no - Do not restore state +# yes - Restore state + +RESTORE_ON_START="yes" + +# SAVE_ON_STOP: +# Do you want to save changes made to your mixer volumes when alsasound +# stops? +# no - Do not save state +# yes - Save state + +SAVE_ON_STOP="yes" + +# LOAD_ON_START: +# Do you want to load sound modules when alsasound starts? +# Note: The Gentoo ALSA developers encourage you to build your sound +# drivers into the kernel unless the device is hotpluggable or +# you need to supply specific options (such as model= to HD-Audio). +# no - Do not load modules +# yes - Load modules +LOAD_ON_START="yes" diff --git a/conf.d/._cfg0000_alsasound b/config-archive/etc/conf.d/alsasound.dist similarity index 100% rename from conf.d/._cfg0000_alsasound rename to config-archive/etc/conf.d/alsasound.dist diff --git a/config-archive/etc/conf.d/libvirtd b/config-archive/etc/conf.d/libvirtd new file mode 100644 index 0000000..9040157 --- /dev/null +++ b/config-archive/etc/conf.d/libvirtd @@ -0,0 +1,37 @@ +# /etc/conf.d/libvirtd + +# LIBVIRTD_OPTS +# You may want to add '--listen' to have libvirtd listen for tcp/ip connections +# if you want to use libvirt for remote control +# Please consult 'libvirtd --help' for more options +#LIBVIRTD_OPTS="--listen" + +# LIBVIRTD_KVM_SHUTDOWN +# Valid options: +# * shutdown - Sends an ACPI shutdown (think when you tap the power button +# on your machine and it begins a graceful shutdown). If your +# VM ignores this, it will have the power yanked out from under +# it in LIBVIRTD_KVM_SHUTDOWN_MAXWAIT seconds. +# * managedsave - Performs a state save external to the VM. qemu-kvm will stop +# stop the CPU and save off all state to a separate file. When +# the machine is started again, it will resume like nothing ever +# happened. This is guarenteed to always successfully stop your +# machine and restart it. However it may take some time to finish. +# * none - No attempts will be made to stop any VMs. If you are restarting your +# machine the qemu-kvm process will be simply killed, which may result +# in your VMs having disk corruption. +LIBVIRTD_KVM_SHUTDOWN="managedsave" + +# LIBVIRTD_KVM_SHUTDOWN_MAXWAIT +# Timeout in seconds until stopping libvirtd and "pulling the plug" on the +# remaining VM's still in a running state +#LIBVIRTD_KVM_SHUTDOWN_MAXWAIT="500" + +# LIBVIRTD_NET_SHUTDOWN +# If libvirtd created networks for you (e.g. NATed networks) then this init +# script will shut them down for you if this is set to 'yes'. Otherwise, +# the networks will be left running once libvirt is shutdown. For this +# option to be useful you must have enabled the 'virt-network' USE flag and +# have had libvirt create a NATed network for you. +# Valid values: 'yes' or 'no' +#LIBVIRTD_NET_SHUTDOWN="yes" diff --git a/conf.d/._cfg0000_libvirtd b/config-archive/etc/conf.d/libvirtd.dist similarity index 100% rename from conf.d/._cfg0000_libvirtd rename to config-archive/etc/conf.d/libvirtd.dist diff --git a/config-archive/etc/cups/cups-pdf.conf b/config-archive/etc/cups/cups-pdf.conf new file mode 100644 index 0000000..895fe9b --- /dev/null +++ b/config-archive/etc/cups/cups-pdf.conf @@ -0,0 +1,265 @@ +# cups-pdf.conf -- CUPS Backend Configuration (version 2.4.8, 2008-06-22) +# 18.09.2005, Volker C. Behr +# Exp. Physik V, Uni Wuerzburg +# vrbehr@cip.physik.uni-wuerzburg.de +# http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf +# +# +# This code may be freely distributed as long as this header +# is preserved. Changes to the code should be clearly indicated. +# +# This code is distributed under the GPL. +# (http://www.gnu.org/copyleft/gpl.html) +# +# For more detailed licensing information see cups-pdf.c in the +# corresponding version number. + +########################################################################### +# # +# This is the configuration file for CUPS-PDF. Values that are not set in # +# here will use the defaults. Changes take effect immediately without the # +# need for restarting any services. # +# # +# Take care not to add whitespaces at the end of a line! # +# # +########################################################################### + + +########################################################################### +# # +# Path Settings # +# # +########################################################################### + +### Key: Out +## CUPS-PDF output directory +## special qualifiers: +## ${HOME} will be expanded to the user's home directory +## ${USER} will be expanded to the user name +## in case it is an NFS export make sure it is exported without +## root_squash! +### Default: /var/spool/cups-pdf/${USER} + +#Out /var/spool/cups-pdf/${USER} + +### Key: AnonDirName +## ABSOLUTE path for anonymously created PDF files +## if anonymous access is disabled this setting has no effect +### Default: /var/spool/cups-pdf/ANONYMOUS + +#AnonDirName /var/spool/cups-pdf/ANONYMOUS + +### Key: Spool +## CUPS-PDF spool directory - make sure there is no user 'SPOOL' on your +## system or change the path +### Default: /var/spool/cups-pdf/SPOOL + +#Spool /var/spool/cups-pdf/SPOOL + + +########################################################################### +# # +# Filename Settings # +# # +########################################################################### + +### Key: Cut +## removing file name extensions before appending .pdf to output +## extensions will only be removed if _both_ the following criteria are met: +## - the extension (w/o the dot) is not longer than characters +## - the remaining filename has a minimal length of 1 character +## set Cut to -1 in order to disable cutting +## recommended values: pure UNIX environment : -1 +## mixed environments : 3 +### Default: 3 + +#Cut 3 + +### Key: Label +## label all jobs with a unique job-id in order to avoid overwriting old +## files in case new ones with identical names are created; always true for +## untitled documents +## 0: label untitled documents only, 1: label all documents +### Default: 0 + +#Label 0 + +### Key: TitlePref +## where to look first for a title when creating the output filename +## (title in PS file or title on commandline): +## 0: prefer title from %Title statement in the PS file +## 1: prefer title passed via commandline +### Default: 0 + +#TitlePref 0 + + +########################################################################### +# # +# User Settings # +# # +########################################################################### + +### Key: AnonUser +## user for anonymous PDF creation (this might be a security issue) +## set this to an empty value to disable anonymous +### Default: nobody + +#AnonUser nobody + +### Key: LowerCase +## This options allows to check user names given to CUPS-PDF additionally +## against their lower case variants. This is necessary since in some +## Windows environments only upper case user names are passed. Usually UNIX +## user names are all lower case and it is save to use this option +## but be aware that it can lead to mis-identifications in case +## you have user names that differ only in upper/lower case. +## check only against user name as passed to CUPS : 0 +## check additionally against lower case user name : 1 +### Default: 1 + +#LowerCase 1 + +### Key: UserPrefix +## some installations require a domain prefix added to the user name +## leave empty for no prefix +### Default: + +#UserPrefix + +### Key: DirPrefix +## if a prefix was defined above this switch toggels whether to include +## the prefix in the output directory's name (if not $HOME) or not +## 0: do not include, 1: include +### Default: 0 + +#DirPrefix 0 + +### Key: RemovePrefix +## some installation pass usernames with a prefix (usually a domain name) +## if you do not want this prefix to be used by the ${USER} variable for +## output directories put the part which is to be cut here +### Default: + +#RemovePrefix + + +########################################################################### +# # +# Security Settings # +# # +########################################################################### + +### Key: AnonUMask +## umask for anonymous output +## these are the _inverse_ permissions to be granted +### Default: 0000 + +#AnonUMask 0000 + +### Key: UserUMask +## umask for user output of known users +## changing this can introduce security leaks if confidential +## information is processed! +### Default: 0077 + +#UserUMask 0077 + +### Key: Grp +## group cups-pdf is supposed to run as - this will also be the gid for all +## created directories and log files +### Default: lp + +#Grp lp + + +########################################################################### +# # +# Log Settings # +# # +########################################################################### + +### Key: Log +## CUPS-PDF log directory +## set this to an empty value to disable all logging +### Default: /var/log/cups + +#Log /var/log/cups + +### Key: LogType +## log-mode +## 1: errors +## 2: status (i.e. activity) +## 4: debug - this will generate a lot of log-output! +## add up values to combine options, i.e. 7 is full logging +## if logging is disabled these setting have no effect +### Default: 3 + +#LogType 3 + + +########################################################################### +# # +# PDF Conversion Settings # +# # +########################################################################### + +### Key: GhostScript +## location of GhostScript binary (gs) +## MacOSX: for using pstopdf (recommended) set this to /usr/bin/pstopdf +## or its proper location on your system +### Default: /usr/bin/gs + +#GhostScript /usr/bin/gs + +### Key: GSTmp +## location of temporary files during GhostScript operation +## this must be user-writable like /var/tmp or /tmp ! +### Default: /var/tmp + +#GSTmp /var/tmp + +### Key: GSCall +## command line for calling GhostScript (!!! DO NOT USE NEWLINES !!!) +## MacOSX: for using pstopdf set this to %s %s -o %s %s +### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s + +#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s + +### Key: PDFVer +## PDF version to be created - can be "1.5", "1.4", "1.3" or "1.2" +## MacOSX: for using pstopdf set this to an empty value +### Default: 1.4 + +#PDFVer 1.4 + +### Key: PostProcessing +## postprocessing script that will be called after the creation of the PDF +## as arguments the filename of the PDF, the username as determined by +## CUPS-PDF and the one as given to CUPS-PDF will be passed +## the script will be called with user privileges +## set this to an empty value to use no postprocessing +### Default: + +#PostProcessing + + +########################################################################### +# # +# Experimental Settings # +# These settings activate experimental options. If you decide to use # +# them I would appreciate any feedback - including an 'ok' if they # +# work as expected - so I can eventually put them into the non- # +# experimental sections. # +# # +########################################################################### + +### Key: DecodeHexStrings +## this option will try to decode hex strings in the title to allow +## internationalized titles +## (have a look at contrib/pstitleconv for a suitable filter for data +## from Windows clients) +## 0: disable, 1: enable +### Default: 0 + +#DecodeHexStrings 0 diff --git a/cups/._cfg0000_cups-pdf.conf b/config-archive/etc/cups/cups-pdf.conf.dist similarity index 100% rename from cups/._cfg0000_cups-pdf.conf rename to config-archive/etc/cups/cups-pdf.conf.dist diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base b/config-archive/etc/eselect/postgresql/slots/9.1/base new file mode 100644 index 0000000..479bd41 --- /dev/null +++ b/config-archive/etc/eselect/postgresql/slots/9.1/base @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2" diff --git a/eselect/postgresql/slots/9.1/._cfg0000_base b/config-archive/etc/eselect/postgresql/slots/9.1/base.dist similarity index 100% rename from eselect/postgresql/slots/9.1/._cfg0000_base rename to config-archive/etc/eselect/postgresql/slots/9.1/base.dist diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs b/config-archive/etc/eselect/postgresql/slots/9.1/docs new file mode 100644 index 0000000..8cec4d4 --- /dev/null +++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2" diff --git a/eselect/postgresql/slots/9.1/._cfg0000_docs b/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist similarity index 100% rename from eselect/postgresql/slots/9.1/._cfg0000_docs rename to config-archive/etc/eselect/postgresql/slots/9.1/docs.dist diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server b/config-archive/etc/eselect/postgresql/slots/9.1/server new file mode 100644 index 0000000..7a0a9c0 --- /dev/null +++ b/config-archive/etc/eselect/postgresql/slots/9.1/server @@ -0,0 +1 @@ +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2" diff --git a/eselect/postgresql/slots/9.1/._cfg0000_server b/config-archive/etc/eselect/postgresql/slots/9.1/server.dist similarity index 100% rename from eselect/postgresql/slots/9.1/._cfg0000_server rename to config-archive/etc/eselect/postgresql/slots/9.1/server.dist diff --git a/config-archive/etc/init.d/alsasound b/config-archive/etc/init.d/alsasound new file mode 100755 index 0000000..6d49375 --- /dev/null +++ b/config-archive/etc/init.d/alsasound @@ -0,0 +1,218 @@ +#!/sbin/runscript +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.2 2011/10/23 15:59:07 polynomial-c Exp $ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d + +extra_commands="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +load_modules() { + # List of drivers for each card. + local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" + + # Fall back on the automated aliases if we don't have ALSA configured properly... + if [ -z "${DRIVERS}" ] && \ + ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then + ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." + DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" + if [ -z "${DRIVERS}" ] ; then + eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" + fi + fi + + if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + fi + + # We want to ensure snd-seq is loaded as it is needed for things like + # timidity even if we don't use a real sequencer. + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + + # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit + # compatibility + DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" + + local DRIVER= DMOD= + for DRIVER in ${DRIVERS} ; do + [ "${DRIVER}" = "off" ] && continue + DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${DRIVER}" + modprobe ${DRIVER} + eend $? + fi + done + + if [ -f /proc/asound/seq/drivers ] ; then + local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" + local SEQUENCER + for SEQUENCER in ${SEQUENCERS} ; do + DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" + if ! grep -q "^${DMOD} " /proc/modules ; then + ebegin "Loading: ${SEQUENCER}" + modprobe ${SEQUENCER} + eend $? + fi + done + fi + + for DRIVER in ${DRIVERS} + do + local TMP=${DRIVER##snd-} + TMP=${TMP##snd_} + if [ -x "${alsascrdir}/${TMP}" ] ; then + ebegin "Running: ${alsascrdir}/${TMP}" + "${alsascrdir}/${TMP}" + eend $? + fi + done + + if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then + eerror "ERROR: Failed to load necessary drivers" + return 1 + fi +} + +unload_modules_24() { + local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" + local MODULE + for MODULE in ${LOADED_MODULES} ; do + rmmod "${MODULE}" + done + rmmod soundcore 2>/dev/null + rmmod gameport 2>/dev/null + + lsmod | grep -vq '^snd' +} + +unload_modules_recursive() { + local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" + + for module in ${revdeps} ; do + unload_modules_recursive "${module}" + done + + vebegin "Unloading: $1" + rmmod --wait "$1" + veend $? +} + +unload_modules_26() { + # First of all, remove the snd module and all the modules depending + # on it, this should remove already most of ALSA modules. + lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd + + # Then find the remaining ones, and handle them too. + for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do + unload_modules_recursive "${module}" + done + + lsmod | grep -vq "^snd" +} + +terminate() { + # + # Kill processes holding open sound devices + # + # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` + local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ + /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ + /dev/patmgr* /dev/sequencer* /dev/sndstat" + local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" + fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null + + # remove all sequencer connections if any + [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall +} + +restore() { + ebegin "Restoring Mixer Levels" + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + mkdir -p "${alsastatedir}" + if ! alsactl -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then + ebegin "Loading ALSA modules" + eindent + load_modules + eoutdent + eend $? || return 1 + fi + + if [ ! -d /proc/asound ]; then + eerror "ALSA failed to load." + eend 1 + return 1 + elif [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ ! -d /proc/asound ] ; then + eerror "ALSA is not loaded" + return 0 + fi + + [ "${SAVE_ON_STOP}" = "yes" ] && save + + return 0 +} diff --git a/init.d/._cfg0000_alsasound b/config-archive/etc/init.d/alsasound.dist similarity index 100% rename from init.d/._cfg0000_alsasound rename to config-archive/etc/init.d/alsasound.dist diff --git a/config-archive/etc/init.d/dbus b/config-archive/etc/init.d/dbus new file mode 100755 index 0000000..502f40f --- /dev/null +++ b/config-archive/etc/init.d/dbus @@ -0,0 +1,51 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $ + +extra_started_commands="reload" + +depend() { + need localmount + after bootmisc +} + +start() { + ebegin "Starting D-BUS system messagebus" + + /usr/bin/dbus-uuidgen --ensure + + # We need to test if /var/run/dbus exists, since script will fail if it does not + [ ! -e /var/run/dbus ] && mkdir /var/run/dbus + + start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system + eend $? +} + +stop() { + local retval + + ebegin "Stopping D-BUS system messagebus" + + start-stop-daemon --stop --pidfile /var/run/dbus.pid + retval=$? + + eend ${retval} + + [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket + + return ${retval} +} + +reload() { + local retval + + ebegin "Reloading D-BUS messagebus config" + + /usr/bin/dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + retval=$? + eend ${retval} + return ${retval} +} diff --git a/init.d/._cfg0000_dbus b/config-archive/etc/init.d/dbus.dist similarity index 100% rename from init.d/._cfg0000_dbus rename to config-archive/etc/init.d/dbus.dist diff --git a/config-archive/etc/init.d/libvirtd b/config-archive/etc/init.d/libvirtd new file mode 100755 index 0000000..3007359 --- /dev/null +++ b/config-archive/etc/init.d/libvirtd @@ -0,0 +1,125 @@ +#!/sbin/runscript + +description="Virtual Machine Management daemon (libvirt)" +extra_commands="halt" +extra_started_commands="reload" +description_halt="Stops the libvirt daemon without stopping your VMs" +description_reload="Restarts the libvirt daemon without stopping your VMs" + +depend() { + need net + after ntp-client ntpd nfs iscsid nfsmount portmap rpc.statd iptables ip6tables ebtables ceph corosync sanlock cgconfig +} + +libvirtd_virsh() { + # Silence errors because virsh always throws an error about + # not finding the hypervisor version when connecting to libvirtd + LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null +} + +libvirtd_dom_list() { + # Make sure that it wouldn't be confused if the domain name + # contains the word running. + libvirtd_virsh list | awk '$3 == "running" { print $1 }' +} + +libvirtd_dom_count() { + # Make sure that it wouldn't be confused if the domain name + # contains the word running. + libvirtd_virsh list | awk 'BEGIN { count = 0 } \ + $3 == "running" { count++ } \ + END { print count }' +} + +libvirtd_net_list() { + # The purpose of the awk is to avoid networks with 'active' in the name + libvirtd_virsh net-list | awk '$2 == "active" { print $1 }' +} + +libvirtd_net_count() { + # The purpose of the awk is to avoid networks with 'active' in the name + libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \ + $2 == "active" { count++ } \ + END { print count }' +} + + +start() { + ebegin "Starting libvirtd" + start-stop-daemon --start \ + --env KRB5_KTNAME=/etc/libvirt/krb5.tab \ + --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping libvirtd" + # try to shutdown all (KVM/Qemu) domains + DOM_COUNT="$(libvirtd_dom_count)" + if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \ + && [ "${DOM_COUNT}" != "0" ] ; then + + einfo " Shutting down domain(s):" + for DOM_ID in $(libvirtd_dom_list) ; do + NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)" + einfo " ${NAME}" + libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null + done + + if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then + COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" + else + COUNTER=500 + fi + + if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then + einfo " Waiting ${COUNTER} seconds while domains shutdown ..." + DOM_COUNT="$(libvirtd_dom_count)" + while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do + DOM_COUNT="$(libvirtd_dom_count)" + sleep 1 + COUNTER=$((${COUNTER} - 1)) + echo -n "." + done + fi + + DOM_COUNT="$(libvirtd_dom_count)" + if [ "${DOM_COUNT}" != "0" ] ; then + eerror " !!! Some guests are still running, stopping anyway" + fi + + fi + + NET_COUNT="$(libvirtd_net_count)" + if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \ + && [ "${NET_COUNT}" != "0" ]; then + + einfo " Shutting down network(s):" + for NET_NAME in $(libvirtd_net_list); do + einfo " ${NET_NAME}" + libvirtd_virsh net-destroy ${NET_NAME} > /dev/null + done + + NET_COUNT="$(libvirtd_net_count)" + if [ "${NET_COUNT}" != "0" ]; then + eerror " !!! Some networks are still active, stopping anyway" + fi + fi + + # Now actually stop the daemon + start-stop-daemon --stop --quiet --exec \ + /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid + eend $? +} + +halt() { + ebegin "Stopping libvirtd without shutting down your VMs" + start-stop-daemon --stop --quiet --exec \ + /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid + eend $? +} + +reload() { + halt + start +} diff --git a/init.d/._cfg0000_libvirtd b/config-archive/etc/init.d/libvirtd.dist similarity index 100% rename from init.d/._cfg0000_libvirtd rename to config-archive/etc/init.d/libvirtd.dist diff --git a/config-archive/etc/libvirt/lxc.conf b/config-archive/etc/libvirt/lxc.conf new file mode 100644 index 0000000..7a5066f --- /dev/null +++ b/config-archive/etc/libvirt/lxc.conf @@ -0,0 +1,13 @@ +# Master configuration file for the LXC driver. +# All settings described here are optional - if omitted, sensible +# defaults are used. + +# By default, log messages generated by the lxc controller go to the +# container logfile. It is also possible to accumulate log messages +# from all lxc controllers along with libvirtd's log outputs. In this +# case, the lxc controller will honor either LIBVIRT_LOG_OUTPUTS or +# log_outputs from libvirtd.conf. +# +# This is disabled by default, uncomment below to enable it. +# +# log_with_libvirtd = 1 diff --git a/libvirt/._cfg0000_lxc.conf b/config-archive/etc/libvirt/lxc.conf.dist similarity index 100% rename from libvirt/._cfg0000_lxc.conf rename to config-archive/etc/libvirt/lxc.conf.dist diff --git a/config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml b/config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml new file mode 100644 index 0000000..cbed030 --- /dev/null +++ b/config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/libvirt/nwfilter/._cfg0000_no-ip-spoofing.xml b/config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml.dist similarity index 100% rename from libvirt/nwfilter/._cfg0000_no-ip-spoofing.xml rename to config-archive/etc/libvirt/nwfilter/no-ip-spoofing.xml.dist diff --git a/cups/cups-pdf.conf b/cups/cups-pdf.conf index 895fe9b..79a3769 100644 --- a/cups/cups-pdf.conf +++ b/cups/cups-pdf.conf @@ -1,8 +1,8 @@ -# cups-pdf.conf -- CUPS Backend Configuration (version 2.4.8, 2008-06-22) +# cups-pdf.conf -- CUPS Backend Configuration (version 2.6.1, 2011-10-04) # 18.09.2005, Volker C. Behr -# Exp. Physik V, Uni Wuerzburg -# vrbehr@cip.physik.uni-wuerzburg.de -# http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf +# Experimentelle Physik V, Universitaet Wuerzburg +# behr@physik.uni-wuerzburg.de +# http://www.cups-pdf.de # # # This code may be freely distributed as long as this header @@ -63,6 +63,15 @@ # # ########################################################################### +### Key: Truncate +## truncate long filenames to a maximum of characters +## this does not consider the full path to the output but only the filename +## without the .pdf-extension or a job-id prefix (see 'Label') +## the minimal value is 8 +### Default: 64 + +#Truncate 64 + ### Key: Cut ## removing file name extensions before appending .pdf to output ## extensions will only be removed if _both_ the following criteria are met: @@ -79,7 +88,9 @@ ## label all jobs with a unique job-id in order to avoid overwriting old ## files in case new ones with identical names are created; always true for ## untitled documents -## 0: label untitled documents only, 1: label all documents +## 0: label untitled documents only +## 1: label all documents with a preceeding "job_#-" +## 2: label all documents with a tailing "-job_#" ### Default: 0 #Label 0 @@ -101,7 +112,8 @@ ########################################################################### ### Key: AnonUser -## user for anonymous PDF creation (this might be a security issue) +## uid for anonymous PDF creation (this might be a security issue) +## this setting has no influence on AnonDirName (see there) ## set this to an empty value to disable anonymous ### Default: nobody @@ -255,7 +267,7 @@ ########################################################################### ### Key: DecodeHexStrings -## this option will try to decode hex strings in the title to allow +## this option will try to decode hex strings in the title to allow ## internationalized titles ## (have a look at contrib/pstitleconv for a suitable filter for data ## from Windows clients) @@ -263,3 +275,13 @@ ### Default: 0 #DecodeHexStrings 0 + +### Key: FixNewlines +## this option will try to fix various unusal line delimiters (e.g. +## form feeds) +## especially useful when using non-Linux-generated files +## 0: disable, 1: enable +### Default: 0 + +#FixNewlines 0 + diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base index 479bd41..34425d9 100644 --- a/eselect/postgresql/slots/9.1/base +++ b/eselect/postgresql/slots/9.1/base @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2" +postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3" diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs index 8cec4d4..4b0d9a8 100644 --- a/eselect/postgresql/slots/9.1/docs +++ b/eselect/postgresql/slots/9.1/docs @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2" +postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3" diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server index 7a0a9c0..a02e087 100644 --- a/eselect/postgresql/slots/9.1/server +++ b/eselect/postgresql/slots/9.1/server @@ -1 +1 @@ -postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2" +postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3" diff --git a/init.d/alsasound b/init.d/alsasound index 6d49375..e3c8dd9 100755 --- a/init.d/alsasound +++ b/init.d/alsasound @@ -1,6 +1,6 @@ #!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.2 2011/10/23 15:59:07 polynomial-c Exp $ -# Copyright 1999-2011 Gentoo Foundation +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r5,v 1.1 2012/02/20 09:03:53 chainsaw Exp $ +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 alsastatedir=/var/lib/alsa @@ -13,125 +13,6 @@ depend() { after bootmisc modules isapnp coldplug hotplug } -load_modules() { - # List of drivers for each card. - local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')" - - # Fall back on the automated aliases if we don't have ALSA configured properly... - if [ -z "${DRIVERS}" ] && \ - ( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then - ewarn "Could not detect custom ALSA settings. Loading all detected alsa drivers." - DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)" - if [ -z "${DRIVERS}" ] ; then - eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?" - fi - fi - - if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - fi - - # We want to ensure snd-seq is loaded as it is needed for things like - # timidity even if we don't use a real sequencer. - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - - # We want to ensure snd-ioctl32 is loaded as it is needed for 32bit - # compatibility - DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')" - - local DRIVER= DMOD= - for DRIVER in ${DRIVERS} ; do - [ "${DRIVER}" = "off" ] && continue - DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')" - if ! grep -q "^${DMOD} " /proc/modules ; then - ebegin "Loading: ${DRIVER}" - modprobe ${DRIVER} - eend $? - fi - done - - if [ -f /proc/asound/seq/drivers ] ; then - local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)" - local SEQUENCER - for SEQUENCER in ${SEQUENCERS} ; do - DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')" - if ! grep -q "^${DMOD} " /proc/modules ; then - ebegin "Loading: ${SEQUENCER}" - modprobe ${SEQUENCER} - eend $? - fi - done - fi - - for DRIVER in ${DRIVERS} - do - local TMP=${DRIVER##snd-} - TMP=${TMP##snd_} - if [ -x "${alsascrdir}/${TMP}" ] ; then - ebegin "Running: ${alsascrdir}/${TMP}" - "${alsascrdir}/${TMP}" - eend $? - fi - done - - if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then - eerror "ERROR: Failed to load necessary drivers" - return 1 - fi -} - -unload_modules_24() { - local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')" - local MODULE - for MODULE in ${LOADED_MODULES} ; do - rmmod "${MODULE}" - done - rmmod soundcore 2>/dev/null - rmmod gameport 2>/dev/null - - lsmod | grep -vq '^snd' -} - -unload_modules_recursive() { - local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")" - - for module in ${revdeps} ; do - unload_modules_recursive "${module}" - done - - vebegin "Unloading: $1" - rmmod --wait "$1" - veend $? -} - -unload_modules_26() { - # First of all, remove the snd module and all the modules depending - # on it, this should remove already most of ALSA modules. - lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd - - # Then find the remaining ones, and handle them too. - for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do - unload_modules_recursive "${module}" - done - - lsmod | grep -vq "^snd" -} - -terminate() { - # - # Kill processes holding open sound devices - # - # DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*` - local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \ - /dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \ - /dev/patmgr* /dev/sequencer* /dev/sndstat" - local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*" - fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null - - # remove all sequencer connections if any - [ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall -} - restore() { ebegin "Restoring Mixer Levels" @@ -148,7 +29,7 @@ restore() { [ -e /dev/snd/controlC${cardnum} ] || sleep 2 [ -e /dev/snd/controlC${cardnum} ] || sleep 2 [ -e /dev/snd/controlC${cardnum} ] || sleep 2 - alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \ + alsactl -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ || ewarn "Errors while restoring defaults, ignoring" done @@ -187,19 +68,7 @@ save() { } start() { - if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then - ebegin "Loading ALSA modules" - eindent - load_modules - eoutdent - eend $? || return 1 - fi - - if [ ! -d /proc/asound ]; then - eerror "ALSA failed to load." - eend 1 - return 1 - elif [ "${RESTORE_ON_START}" = "yes" ]; then + if [ "${RESTORE_ON_START}" = "yes" ]; then restore fi @@ -207,12 +76,8 @@ start() { } stop() { - if [ ! -d /proc/asound ] ; then - eerror "ALSA is not loaded" - return 0 + if [ "${SAVE_ON_STOP}" = "yes" ]; then + save fi - - [ "${SAVE_ON_STOP}" = "yes" ] && save - return 0 } diff --git a/init.d/dbus b/init.d/dbus index 502f40f..65271f6 100755 --- a/init.d/dbus +++ b/init.d/dbus @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $ extra_started_commands="reload" @@ -12,8 +12,7 @@ depend() { start() { ebegin "Starting D-BUS system messagebus" - - /usr/bin/dbus-uuidgen --ensure + /usr/bin/dbus-uuidgen --ensure=/etc/machine-id # We need to test if /var/run/dbus exists, since script will fail if it does not [ ! -e /var/run/dbus ] && mkdir /var/run/dbus diff --git a/init.d/libvirtd b/init.d/libvirtd index 3007359..402617f 100755 --- a/init.d/libvirtd +++ b/init.d/libvirtd @@ -1,8 +1,8 @@ #!/sbin/runscript description="Virtual Machine Management daemon (libvirt)" -extra_commands="halt" extra_started_commands="reload" +extra_stopped_commands="halt" description_halt="Stops the libvirt daemon without stopping your VMs" description_reload="Restarts the libvirt daemon without stopping your VMs" @@ -12,33 +12,36 @@ depend() { } libvirtd_virsh() { + local mode=$1 + shift + # Silence errors because virsh always throws an error about # not finding the hypervisor version when connecting to libvirtd - LC_ALL=C virsh -c qemu:///system "$@" 2>/dev/null + LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null } libvirtd_dom_list() { # Make sure that it wouldn't be confused if the domain name # contains the word running. - libvirtd_virsh list | awk '$3 == "running" { print $1 }' + libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }' } libvirtd_dom_count() { # Make sure that it wouldn't be confused if the domain name # contains the word running. - libvirtd_virsh list | awk 'BEGIN { count = 0 } \ + libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \ $3 == "running" { count++ } \ END { print count }' } libvirtd_net_list() { # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh net-list | awk '$2 == "active" { print $1 }' + libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }' } libvirtd_net_count() { # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh net-list | awk 'BEGIN { count = 0 } \ + libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \ $2 == "active" { count++ } \ END { print count }' } @@ -53,55 +56,56 @@ start() { } stop() { + local counter= + local vm_name= + local net_name= + local dom_id= + ebegin "Stopping libvirtd" # try to shutdown all (KVM/Qemu) domains - DOM_COUNT="$(libvirtd_dom_count)" if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \ - && [ "${DOM_COUNT}" != "0" ] ; then + && [ "$(libvirtd_dom_count qemu)" != "0" ] ; then einfo " Shutting down domain(s):" - for DOM_ID in $(libvirtd_dom_list) ; do - NAME="$(libvirtd_virsh domname ${DOM_ID} | head -n 1)" - einfo " ${NAME}" - libvirtd_virsh ${LIBVIRTD_KVM_SHUTDOWN} ${DOM_ID} > /dev/null + for dom_id in $(libvirtd_dom_list qemu) ; do + vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)" + einfo " ${vm_name}" + libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null done if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then - COUNTER="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" + counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" else - COUNTER=500 + counter=500 fi if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then - einfo " Waiting ${COUNTER} seconds while domains shutdown ..." - DOM_COUNT="$(libvirtd_dom_count)" - while [ ${DOM_COUNT} -gt 0 ] && [ ${COUNTER} -gt 0 ] ; do - DOM_COUNT="$(libvirtd_dom_count)" - sleep 1 - COUNTER=$((${COUNTER} - 1)) - echo -n "." + einfo " Waiting ${counter} seconds while domains shutdown ..." + DOM_COUNT="$(libvirtd_dom_count qemu)" + while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do + DOM_COUNT="$(libvirtd_dom_count qemu)" + sleep 1 + counter=$((${counter} - 1)) + echo -n "." done fi - DOM_COUNT="$(libvirtd_dom_count)" - if [ "${DOM_COUNT}" != "0" ] ; then + if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then eerror " !!! Some guests are still running, stopping anyway" fi fi - NET_COUNT="$(libvirtd_net_count)" - if [ "${LIBVIRTD_NET_SHUTDOWN}" != "no" ] \ - && [ "${NET_COUNT}" != "0" ]; then + if [ "${LIBVIRTD_KVM_NET_SHUTDOWN}" != "no" ] \ + && [ "$(libvirtd_net_count qemu)" != "0" ]; then einfo " Shutting down network(s):" - for NET_NAME in $(libvirtd_net_list); do - einfo " ${NET_NAME}" - libvirtd_virsh net-destroy ${NET_NAME} > /dev/null + for net_name in $(libvirtd_net_list qemu); do + einfo " ${net_name}" + libvirtd_virsh qemu net-destroy ${net_name} > /dev/null done - NET_COUNT="$(libvirtd_net_count)" - if [ "${NET_COUNT}" != "0" ]; then + if [ "$(libvirtd_net_count qemu)" != "0" ]; then eerror " !!! Some networks are still active, stopping anyway" fi fi diff --git a/libvirt/lxc.conf b/libvirt/lxc.conf index 7a5066f..09dc95f 100644 --- a/libvirt/lxc.conf +++ b/libvirt/lxc.conf @@ -11,3 +11,21 @@ # This is disabled by default, uncomment below to enable it. # # log_with_libvirtd = 1 + + +# The default security driver is SELinux. If SELinux is disabled +# on the host, then the security driver will automatically disable +# itself. If you wish to disable QEMU SELinux security driver while +# leaving SELinux enabled for the host in general, then set this +# to 'none' instead. +# +# security_driver = "selinux" + +# If set to non-zero, then the default security labeling +# will make guests confined. If set to zero, then guests +# will be unconfined by default. Defaults to 0. +# security_default_confined = 1 + +# If set to non-zero, then attempts to create unconfined +# guests will be blocked. Defaults to 0. +# security_require_confined = 1 diff --git a/libvirt/nwfilter/no-ip-spoofing.xml b/libvirt/nwfilter/no-ip-spoofing.xml index cbed030..f8c9573 100644 --- a/libvirt/nwfilter/no-ip-spoofing.xml +++ b/libvirt/nwfilter/no-ip-spoofing.xml @@ -1,7 +1,7 @@ - - - + + + -- 2.39.5