From 8f8564ce9680fe0c34ba7197a93940d14370cd7b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Apr 2015 20:46:29 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- ._cfg0000_profile | 63 --------- X11/xinit/._cfg0000_xinitrc | 109 --------------- X11/xinit/xinitrc | 43 ++++++ conf.d/._cfg0000_dmcrypt | 98 ------------- conf.d/._cfg0000_syslog-ng | 42 ------ conf.d/dmcrypt | 2 +- conf.d/syslog-ng | 2 +- cups/._cfg0000_cups-browsed.conf | 67 --------- cups/._cfg0000_cups-files.conf | 96 ------------- cups/._cfg0000_snmp.conf | 7 - cups/cups-browsed.conf | 1 + cups/cups-files.conf | 11 +- cups/snmp.conf | 10 +- init.d/._cfg0000_consolefont | 63 --------- init.d/._cfg0000_dmesg | 18 --- init.d/._cfg0000_fsck | 123 ----------------- init.d/._cfg0000_hostname | 19 --- init.d/._cfg0000_keymaps | 70 ---------- init.d/._cfg0000_killprocs | 22 --- init.d/._cfg0000_modules | 63 --------- init.d/._cfg0000_numlock | 42 ------ init.d/._cfg0000_root | 53 ------- init.d/._cfg0000_rpc.statd | 33 ----- init.d/._cfg0000_swap | 36 ----- init.d/._cfg0000_swapfiles | 39 ------ init.d/._cfg0000_termencoding | 48 ------- init.d/._cfg0000_urandom | 45 ------ init.d/consolefont | 2 +- init.d/dmesg | 2 +- init.d/fsck | 2 +- init.d/hostname | 2 +- init.d/keymaps | 2 +- init.d/killprocs | 2 +- init.d/modules | 2 +- init.d/numlock | 2 +- init.d/root | 2 +- init.d/rpc.statd | 4 +- init.d/swap | 2 +- init.d/swapfiles | 2 +- init.d/termencoding | 2 +- init.d/urandom | 2 +- modprobe.d/._cfg0000_nvidia.conf | 14 -- modprobe.d/._cfg0001_nvidia.conf | 14 -- modprobe.d/nvidia.conf | 2 +- .../._cfg0000_nvidia-application-profiles-rc | 85 ------------ .../._cfg0001_nvidia-application-profiles-rc | 85 ------------ nvidia/nvidia-application-profiles-rc | 4 +- postfix/._cfg0000_master.cf | 130 ------------------ postfix/master.cf | 2 +- profile | 1 - 50 files changed, 70 insertions(+), 1522 deletions(-) delete mode 100644 ._cfg0000_profile delete mode 100644 X11/xinit/._cfg0000_xinitrc delete mode 100644 conf.d/._cfg0000_dmcrypt delete mode 100644 conf.d/._cfg0000_syslog-ng delete mode 100644 cups/._cfg0000_cups-browsed.conf delete mode 100644 cups/._cfg0000_cups-files.conf delete mode 100644 cups/._cfg0000_snmp.conf delete mode 100755 init.d/._cfg0000_consolefont delete mode 100755 init.d/._cfg0000_dmesg delete mode 100755 init.d/._cfg0000_fsck delete mode 100755 init.d/._cfg0000_hostname delete mode 100755 init.d/._cfg0000_keymaps delete mode 100755 init.d/._cfg0000_killprocs delete mode 100755 init.d/._cfg0000_modules delete mode 100755 init.d/._cfg0000_numlock delete mode 100755 init.d/._cfg0000_root delete mode 100755 init.d/._cfg0000_rpc.statd delete mode 100755 init.d/._cfg0000_swap delete mode 100755 init.d/._cfg0000_swapfiles delete mode 100755 init.d/._cfg0000_termencoding delete mode 100755 init.d/._cfg0000_urandom delete mode 100644 modprobe.d/._cfg0000_nvidia.conf delete mode 100644 modprobe.d/._cfg0001_nvidia.conf delete mode 100644 nvidia/._cfg0000_nvidia-application-profiles-rc delete mode 100644 nvidia/._cfg0001_nvidia-application-profiles-rc delete mode 100644 postfix/._cfg0000_master.cf 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/X11/xinit/._cfg0000_xinitrc b/X11/xinit/._cfg0000_xinitrc deleted file mode 100644 index e6dd7fe..0000000 --- a/X11/xinit/._cfg0000_xinitrc +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/Xresources -sysmodmap=/etc/X11/xinit/Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - - - - - - - - xrdb -merge $sysresources - -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f "$userresources" ]; then - - - - - - - - xrdb -merge "$userresources" - -fi - -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi - -# start some nice programs - - -if [ -n "`/etc/X11/chooser.sh`" ]; then - command="`/etc/X11/chooser.sh`" -else - failsafe="yes" -fi - -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?* ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -if [ -n "$failsafe" ]; then - twm & - xclock -geometry 50x50-1+1 & - xterm -geometry 80x50+494+51 & - xterm -geometry 80x20+494-0 & - exec xterm -geometry 80x66+0+0 -name login -else - exec $command -fi diff --git a/X11/xinit/xinitrc b/X11/xinit/xinitrc index a367319..e6dd7fe 100644 --- a/X11/xinit/xinitrc +++ b/X11/xinit/xinitrc @@ -1,3 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #!/bin/sh userresources=$HOME/.Xresources diff --git a/conf.d/._cfg0000_dmcrypt b/conf.d/._cfg0000_dmcrypt deleted file mode 100644 index 9747dff..0000000 --- a/conf.d/._cfg0000_dmcrypt +++ /dev/null @@ -1,98 +0,0 @@ -# /etc/conf.d/dmcrypt - -# For people who run dmcrypt on top of some other layer (like raid), -# use rc_need to specify that requirement. See the runscript(8) man -# page for more information. - -#-------------------- -# Instructions -#-------------------- - -# Note regarding the syntax of this file. This file is *almost* bash, -# but each line is evaluated separately. Separate swaps/targets can be -# specified. The init-script which reads this file assumes that a -# swap= or target= line starts a new section, similar to lilo or grub -# configuration. - -# Note when using gpg keys and /usr on a separate partition, you will -# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly -# and ensure that gpg has been compiled statically. -# See http://bugs.gentoo.org/90482 for more information. - -# Note that the init-script which reads this file detects whether your -# partition is LUKS or not. No mkfs is run unless you specify a makefs -# option. - -# Global options: -#---------------- - -# Max number of checks to perform (1 per second) -#dmcrypt_max_timeout=120 - -# Arguments: -#----------- -# target= == Mapping name for partition. -# swap= == Mapping name for swap partition. -# source='' == Real device for partition. -# key='[:]' == Fullpath from / or from inside removable media. -# remdev='' == Device that will be assigned to removable media. -# gpg_options='' == Default are --quiet --decrypt -# options='' == cryptsetup, for LUKS you can only use --readonly -# loop_file='' == Loopback file. -# pre_mount='cmds' == commands to execute before mounting partition. -# post_mount='cmds' == commands to execute after mounting partition. -#----------- -# Supported Modes -# gpg == decrypt and pipe key into cryptsetup. -# Note: new-line character must not be part of key. -# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' - -#-------------------- -# dm-crypt examples -#-------------------- - -## swap -# Swap partitions. These should come first so that no keys make their -# way into unencrypted swap. -# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom -# If no makefs is given then mkswap will be assumed -#swap=crypt-swap -#source='/dev/hda2' - -## /home with passphrase -#target=crypt-home -#source='/dev/hda5' - -## /home with regular keyfile -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' - -## /home with gpg protected key -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' - -## /home with regular keyfile on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' -#remdev='/dev/sda1' - -##/home with gpg protected key on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' -#remdev='/dev/sda1' - -##/tmp with regular keyfile -#target=crypt-tmp -#source='/dev/hda6' -#key='/full/path/to/tmpkey' -#pre_mount='/sbin/mkreiserfs -f -f ${dev}' -#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' - -## Loopback file example -#target='crypt-loop-home' -#source='/dev/loop0' -#loop_file='/mnt/crypt/home' diff --git a/conf.d/._cfg0000_syslog-ng b/conf.d/._cfg0000_syslog-ng deleted file mode 100644 index 42fa26a..0000000 --- a/conf.d/._cfg0000_syslog-ng +++ /dev/null @@ -1,42 +0,0 @@ -# Config file for /etc/init.d/syslog-ng - -# If you are not using network logging, this entire section should be -# commented out. Otherwise, choose one of the settings below based on -# how you are configuring your network. -# -# If you are using the net.* scripts to configure your network, you should -# set rc_need to match the interface through which your logging server -# can be reached. -#rc_need="net.eth0" -# -# If you are using an interface manager like wicd, dhcpcd in standalone -# mode, networkmanager, etc to control your interfaces, set rc_need to -# the name of that service. -# rc_need="dhcpcd" -#rc_need="networkmanager" -# -# If you are using newnet and configuring your interface statically with -# the network script, you should use this setting. -#rc_need="network" -# -# You can use this setting, but I do not recommend relying on it. -#rc_need="net" -# -# You may also want to uncomment the following if you are using network -# logging. -#rc_use="stunnel" - -# For very customized setups these variables can be adjusted as needed -# but for most situations they should remain commented: -# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf -# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng -# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/run -# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid -# SYSLOG_NG_GROUP=root -# SYSLOG_NG_USER=root - -# Put any additional options for syslog-ng here. -# See syslog-ng(8) for more information. - -SYSLOG_NG_OPTS="" diff --git a/conf.d/dmcrypt b/conf.d/dmcrypt index 35a1fd2..9747dff 100644 --- a/conf.d/dmcrypt +++ b/conf.d/dmcrypt @@ -93,6 +93,6 @@ #post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' ## Loopback file example -#mount='crypt-loop-home' +#target='crypt-loop-home' #source='/dev/loop0' #loop_file='/mnt/crypt/home' diff --git a/conf.d/syslog-ng b/conf.d/syslog-ng index 6a437d1..42fa26a 100644 --- a/conf.d/syslog-ng +++ b/conf.d/syslog-ng @@ -31,7 +31,7 @@ # SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf # SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng # SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist -# SYSLOG_NG_PIDFILE_DIR=/var/run +# SYSLOG_NG_PIDFILE_DIR=/run # SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid # SYSLOG_NG_GROUP=root # SYSLOG_NG_USER=root diff --git a/cups/._cfg0000_cups-browsed.conf b/cups/._cfg0000_cups-browsed.conf deleted file mode 100644 index b90f1de..0000000 --- a/cups/._cfg0000_cups-browsed.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Which protocols will we use to discover printers on the network? -# Can use DNSSD and/or CUPS, or 'none' for neither. -BrowseRemoteProtocols DNSSD,CUPS - -# Which protocols will we use to broadcast shared local printers to the network? -# Can use DNSSD and/or CUPS, or 'none' for neither. -# Only CUPS is actually supported, as DNSSD is done by CUPS itself (we ignore -# DNSSD in this directive). -# BrowseLocalProtocols none - -# Settings of this directive apply to both BrowseRemoteProtocols and -# BrowseLocalProtocols. -# Can use DNSSD and/or CUPS, or 'none' for neither. -# BrowseProtocols none - -# Only browse remote printers from selected servers -# BrowseAllow All -# BrowseAllow cups.example.com -# BrowseAllow 192.168.1.12 -# BrowseAllow 192.168.1.0/24 -# BrowseAllow 192.168.1.0/255.255.255.0 - -# Use BrowsePoll to poll a particular CUPS server -# BrowsePoll cups.example.com -# BrowsePoll cups.example.com:631 -# BrowsePoll cups.example.com:631/version=1.1 - -# Use DomainSocket to access the local CUPS daemon via another than the -# default domain socket -# DomainSocket /var/lib/run/cups/cups.sock - -# Set CreateIPPPrinterQueues to "Yes" to let cups-browsed discover IPP -# network printers (native printers, not CUPS queues) with known page -# description languages (PWG Raster, PDF, PostScript, PCL XL, PCL -# 5c/e) in the local network and auto-create PPD-less print queues for -# them (using a System V interface script to control the filter -# chain). Clients have to IPP-poll the capabilities of the printer and -# send option settings as standard IPP attributes. We do not poll the -# capabilities by ourselves to not wake up the printer from -# power-saving mode when creating the queues. Jobs have to be sent in -# PDF format. Other formats are not accepted. This functionality is -# primarily for mobile devices running CUPS to not need a printer -# setup tool nor a collection of printer drivers and PPDs. - -# CreateIPPPrinterQueues Yes - -# The AutoShutdown directive specifies whether cups-browsed should -# automatically terminate when it has no local raw queues set up -# pointing to any discovered remote printers (auto shutdown -# mode). Setting it to "On" activates the auto-shutdown mode, setting -# it to "Off" deactiivates it (the default). The special mode "avahi" -# turns auto shutdown off while avahi-daemon is running and on when -# avahi-daemon stops. This allows running cups-browsed on-demand when -# avahi-daemon is run on-demand. - -# AutoShutdown Off -# AutoShutdown On -# AutoShutdown avahi - -# The AutoShutdownTimeout directive specifies after how many seconds -# without local raw queues set up pointing to any discovered remote -# printers cups-browsed should actually shut down in auto shutdown -# mode. Default is 30 seconds, 0 means immediate shutdown. - -# AutoShutdownTimeout 30 - -# Unknown directives are ignored, also unknown values. diff --git a/cups/._cfg0000_cups-files.conf b/cups/._cfg0000_cups-files.conf deleted file mode 100644 index 9cbbad8..0000000 --- a/cups/._cfg0000_cups-files.conf +++ /dev/null @@ -1,96 +0,0 @@ -# -# File/directory/user/group configuration file for the CUPS scheduler. -# See "man cups-files.conf" for a complete description of this file. -# - -# List of events that are considered fatal errors for the scheduler... -#FatalErrors config - -# Do we call fsync() after writing configuration or status files? -#SyncOnClose No - -# Default user and group for filters/backends/helper programs; this cannot be -# any user or group that resolves to ID 0 for security reasons... -#User lp -#Group lp - -# Administrator user group, used to match @SYSTEM in cupsd.conf policy rules... -# This cannot contain the Group value for security reasons... -SystemGroup lpadmin - - -# User that is substituted for unauthenticated (remote) root accesses... -#RemoteRoot remroot - -# Do we allow file: device URIs other than to /dev/null? -#FileDevice No - -# Permissions for configuration and log files... -#ConfigFilePerm 0640 -#LogFilePerm 0644 - -# Location of the file logging all access to the scheduler; may be the name -# "syslog". If not an absolute path, the value of ServerRoot is used as the -# root directory. Also see the "AccessLogLevel" directive in cupsd.conf. -AccessLog /var/log/cups/access_log - -# Location of cache files used by the scheduler... -#CacheDir /var/cache/cups - -# Location of data files used by the scheduler... -#DataDir /usr/share/cups - -# Location of the static web content served by the scheduler... -#DocumentRoot /usr/share/cups/html - -# Location of the file logging all messages produced by the scheduler and any -# helper programs; may be the name "syslog". If not an absolute path, the value -# of ServerRoot is used as the root directory. Also see the "LogLevel" -# directive in cupsd.conf. -ErrorLog /var/log/cups/error_log - -# Location of fonts used by older print filters... -#FontPath /usr/share/cups/fonts - -# Location of LPD configuration -#LPDConfigFile xinetd:///etc/xinetd.d/cups-lpd - -# Location of the file logging all pages printed by the scheduler and any -# helper programs; may be the name "syslog". If not an absolute path, the value -# of ServerRoot is used as the root directory. Also see the "PageLogFormat" -# directive in cupsd.conf. -PageLog /var/log/cups/page_log - -# Location of the file listing all of the local printers... -#Printcap /etc/printcap - -# Format of the Printcap file... -#PrintcapFormat bsd -#PrintcapFormat plist -#PrintcapFormat solaris - -# Location of all spool files... -#RequestRoot /var/spool/cups - -# Location of helper programs... -#ServerBin /usr/lib/cups - -# SSL/TLS certificate for the scheduler... -#ServerCertificate ssl/server.crt - -# SSL/TLS private key for the scheduler... -#ServerKey ssl/server.key - -# Location of other configuration files... -#ServerRoot /etc/cups - -# Location of Samba configuration file... -#SMBConfigFile - -# Location of scheduler state files... -#StateDir /run/cups - -# Location of scheduler/helper temporary files. This directory is emptied on -# scheduler startup and cannot be one of the standard (public) temporary -# directory locations for security reasons... -#TempDir /var/spool/cups/tmp diff --git a/cups/._cfg0000_snmp.conf b/cups/._cfg0000_snmp.conf deleted file mode 100644 index a7d1e3b..0000000 --- a/cups/._cfg0000_snmp.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# SNMP configuration file for CUPS. See "man cups-snmp.conf" for a complete -# description of this file. -# - -Address @LOCAL -Community public diff --git a/cups/cups-browsed.conf b/cups/cups-browsed.conf index df0a415..b90f1de 100644 --- a/cups/cups-browsed.conf +++ b/cups/cups-browsed.conf @@ -14,6 +14,7 @@ BrowseRemoteProtocols DNSSD,CUPS # BrowseProtocols none # Only browse remote printers from selected servers +# BrowseAllow All # BrowseAllow cups.example.com # BrowseAllow 192.168.1.12 # BrowseAllow 192.168.1.0/24 diff --git a/cups/cups-files.conf b/cups/cups-files.conf index e5f876e..9cbbad8 100644 --- a/cups/cups-files.conf +++ b/cups/cups-files.conf @@ -1,7 +1,5 @@ # -# "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $" -# -# Sample file/directory/user/group configuration file for the CUPS scheduler. +# File/directory/user/group configuration file for the CUPS scheduler. # See "man cups-files.conf" for a complete description of this file. # @@ -17,6 +15,7 @@ #Group lp # Administrator user group, used to match @SYSTEM in cupsd.conf policy rules... +# This cannot contain the Group value for security reasons... SystemGroup lpadmin @@ -54,7 +53,7 @@ ErrorLog /var/log/cups/error_log #FontPath /usr/share/cups/fonts # Location of LPD configuration -#LPDConfigFile +#LPDConfigFile xinetd:///etc/xinetd.d/cups-lpd # Location of the file logging all pages printed by the scheduler and any # helper programs; may be the name "syslog". If not an absolute path, the value @@ -95,7 +94,3 @@ PageLog /var/log/cups/page_log # scheduler startup and cannot be one of the standard (public) temporary # directory locations for security reasons... #TempDir /var/spool/cups/tmp - -# -# End of "$Id: cups-files.conf.in 11201 2013-07-26 21:27:27Z msweet $". -# diff --git a/cups/snmp.conf b/cups/snmp.conf index a672a80..a7d1e3b 100644 --- a/cups/snmp.conf +++ b/cups/snmp.conf @@ -1,13 +1,7 @@ # -# "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $" -# -# Sample SNMP configuration file for CUPS. See "man cups-snmp.conf" for a -# complete description of this file. +# SNMP configuration file for CUPS. See "man cups-snmp.conf" for a complete +# description of this file. # Address @LOCAL Community public - -# -# End of "$Id: snmp.conf.in 11025 2013-06-07 01:00:33Z msweet $". -# diff --git a/init.d/._cfg0000_consolefont b/init.d/._cfg0000_consolefont deleted file mode 100755 index 47bf2a4..0000000 --- a/init.d/._cfg0000_consolefont +++ /dev/null @@ -1,63 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Sets a font for the consoles." - -depend() -{ - need localmount termencoding - after hotplug bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc -} - -start() -{ - ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} - consolefont=${consolefont:-${CONSOLEFONT}} - unicodemap=${unicodemap:-${UNICODEMAP}} - consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}} - - if [ -z "$consolefont" ]; then - ebegin "Using the default console font" - eend 0 - return 0 - fi - - if [ "$ttyn" = 0 ]; then - ebegin "Skipping font setup (rc_tty_number == 0)" - eend 0 - return 0 - fi - - local x= param= sf_param= retval=0 ttydev=/dev/tty - - # Get additional parameters - if [ -n "$consoletranslation" ]; then - param="$param -m $consoletranslation" - fi - if [ -n "${unicodemap}" ]; then - param="$param -u $unicodemap" - fi - - # Set the console font - ebegin "Setting console font [$consolefont]" - [ -d /dev/vc ] && ttydev=/dev/vc/ - x=1 - while [ $x -le $ttyn ]; do - if ! setfont $consolefont $param -C $ttydev$x >/dev/null; then - retval=1 - break - fi - : $(( x += 1 )) - done - eend $retval - - # Store the font so we can use it ASAP on boot - if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then - mkdir -p "$RC_LIBEXECDIR"/console - setfont -O "$RC_LIBEXECDIR"/console/font - fi - - return $retval -} diff --git a/init.d/._cfg0000_dmesg b/init.d/._cfg0000_dmesg deleted file mode 100755 index 98c2c43..0000000 --- a/init.d/._cfg0000_dmesg +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2008 Roy Marples -# Released under the 2-clause BSD license. - -description="Set the dmesg level for a cleaner boot" - -depend() -{ - before dev modules - keyword -lxc -prefix -vserver -} - -start() -{ - if [ -n "$dmesg_level" ]; then - dmesg -n$dmesg_level - fi -} diff --git a/init.d/._cfg0000_fsck b/init.d/._cfg0000_fsck deleted file mode 100755 index 0130376..0000000 --- a/init.d/._cfg0000_fsck +++ /dev/null @@ -1,123 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Check and repair filesystems according to /etc/fstab" -_IFS=" -" - -depend() -{ - use dev clock modules - keyword -jail -openvz -prefix -timeout -vserver -lxc -uml -} - -_abort() { - rc-abort - return 1 -} - -# We should only reboot when first booting -_reboot() { - if [ "$RC_RUNLEVEL" = "$RC_BOOTLEVEL" ]; then - reboot "$@" - _abort || return 1 - fi -} - -_forcefsck() -{ - [ -e /forcefsck ] || get_bootparam forcefsck -} - -start() -{ - local fsck_opts= p= check_extra= - - if [ -e /fastboot ]; then - ewarn "Skipping fsck due to /fastboot" - return 0 - fi - if _forcefsck; then - fsck_opts="$fsck_opts -f" - check_extra="(check forced)" - elif ! yesno ${fsck_on_battery:-YES} && ! on_ac_power; then - ewarn "Skipping fsck due to not being on AC power" - return 0 - fi - - if [ -n "$fsck_passno" ]; then - check_extra="[passno $fsck_passno] $check_extra" - if [ -n "$fsck_mnt" ]; then - eerror "Only 1 of fsck_passno and fsck_mnt must be set!" - return 1 - fi - fi - ebegin "Checking local filesystems $check_extra" - # Append passno mounts - for p in $fsck_passno; do - local IFS="$_IFS" - case "$p" in - [0-9]*) p="=$p";; - esac - set -- "$@" $(fstabinfo --passno "$p") - unset IFS - done - # Append custom mounts - for m in $fsck_mnt ; do - local IFS="$_IFS" - set -- "$@" "$m" - unset IFS - done - - if [ "$RC_UNAME" = Linux ]; then - local skiptypes - skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list}) - [ "${skiptypes}" = "no," ] && skiptypes="" - fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev" - if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then - fsck_args=${fsck_args:--A -p} - if echo 2>/dev/null >/.test.$$; then - rm -f /.test.$$ - fsck_opts="$fsck_opts -R" - fi - fi - fi - - trap : INT QUIT - fsck ${fsck_args:--p} $fsck_opts "$@" - case $? in - 0) eend 0; return 0;; - 1) ewend 1 "Filesystems repaired"; return 0;; - 2|3) if [ "$RC_UNAME" = Linux ]; then - ewend 1 "Filesystems repaired, but reboot needed" - _reboot -f - else - ewend 1 "Filesystems still have errors;" \ - "manual fsck required" - _abort - fi;; - 4) if [ "$RC_UNAME" = Linux ]; then - ewend 1 "Fileystem errors left uncorrected, aborting" - _abort - else - ewend 1 "Filesystems repaired, but reboot needed" - _reboot - fi;; - 8) ewend 1 "Operational error"; return 0;; - 12) ewend 1 "fsck interrupted";; - *) eend 2 "Filesystems couldn't be fixed";; - esac - _abort || return 1 -} - -stop() -{ - # Fake function so we always shutdown correctly. - _abort() { return 0; } - _reboot() { return 0; } - _forcefsck() { return 1; } - - yesno $fsck_shutdown && start - return 0 -} diff --git a/init.d/._cfg0000_hostname b/init.d/._cfg0000_hostname deleted file mode 100755 index 7d2a2d9..0000000 --- a/init.d/._cfg0000_hostname +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Sets the hostname of the machine." - -depend() { - keyword -prefix -lxc -} - -start() -{ - # HOSTNAME variable used to be defined in caps in conf.d/hostname. - # It is also a magic variable in bash. - hostname=${hostname-${HOSTNAME-localhost}} # checkbashisms: false positive - ebegin "Setting hostname to $hostname" - hostname "$hostname" - eend $? "Failed to set the hostname" -} diff --git a/init.d/._cfg0000_keymaps b/init.d/._cfg0000_keymaps deleted file mode 100755 index 0cadd7d..0000000 --- a/init.d/._cfg0000_keymaps +++ /dev/null @@ -1,70 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2008 Roy Marples -# Released under the 2-clause BSD license. - -description="Applies a keymap for the consoles." - -depend() -{ - need localmount termencoding - after bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc -} - -start() -{ - ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} - : ${unicode:=$UNICODE} - : ${keymap:=$KEYMAP} - : ${extended_keymaps:=$EXTENDED_KEYMAPS} - : ${windowkeys:=$SET_WINDOWSKEYS} - : ${fix_euro:=$FIX_EURO} - : ${dumpkeys_charset:=${DUMPKEYS_CHARSET}} - - if [ -z "$keymap" ]; then - eerror "You need to setup keymap in /etc/conf.d/keymaps first" - return 1 - fi - - local ttydev=/dev/tty n= - [ -d /dev/vc ] && ttydev=/dev/vc/ - - # Force linux keycodes for PPC. - if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then - echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes - fi - - local wkeys= kmode="-a" msg="ASCII" - if yesno $unicode; then - kmode="-u" - msg="UTF-8" - fi - yesno $windowkeys && wkeys="windowkeys" - - # Set terminal encoding to either ASCII or UNICODE. - # See utf-8(7) for more information. - ebegin "Setting keyboard mode [$msg]" - n=1 - while [ $n -le $ttyn ]; do - kbd_mode $kmode -C $ttydev$n - : $(( n += 1 )) - done - eend 0 - - ebegin "Loading key mappings [$keymap]" - loadkeys -q $wkeys $keymap $extended_keymaps - eend $? "Error loading key mappings" || return $? - - if yesno $fix_euro; then - ebegin "Fixing font for euro symbol" - # Fix some fonts displaying the Euro, #173528. - echo "altgr keycode 18 = U+20AC" | loadkeys -q - - eend $? - fi - - # Save the keymapping for use immediately at boot - if checkpath -W "$RC_LIBEXECDIR"; then - mkdir -p "$RC_LIBEXECDIR"/console - dumpkeys >"$RC_LIBEXECDIR"/console/keymap - fi -} diff --git a/init.d/._cfg0000_killprocs b/init.d/._cfg0000_killprocs deleted file mode 100755 index f07de69..0000000 --- a/init.d/._cfg0000_killprocs +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2008 Roy Marples -# Released under the 2-clause BSD license. - -description="Kill all processes so we can unmount disks cleanly." - -depend() -{ - keyword -prefix -} - -start() -{ - ebegin "Terminating remaining processes" - killall5 -15 ${killall5_opts} - sleep 1 - eend 0 - ebegin "Killing remaining processes" - killall5 -9 ${killall5_opts} - sleep 1 - eend 0 -} diff --git a/init.d/._cfg0000_modules b/init.d/._cfg0000_modules deleted file mode 100755 index 15f98b0..0000000 --- a/init.d/._cfg0000_modules +++ /dev/null @@ -1,63 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Loads a user defined list of kernel modules." - -depend() -{ - use isapnp - keyword -openvz -prefix -vserver -lxc -} - -start() -{ - # Should not fail if kernel do not have module - # support compiled in ... - [ ! -f /proc/modules ] && return 0 - - local KV x y kv_variant_list - KV=$(uname -r) - # full $KV - kv_variant_list="${KV}" - # remove any KV_EXTRA options to just get the full version - x=${KV%%-*} - # now slowly strip them - while [ -n "$x" ] && [ "$x" != "$y" ]; do - kv_variant_list="${kv_variant_list} $x" - y=$x - x=${x%.*} - done - - local list= x= xx= y= args= mpargs= cnt=0 a= - for x in $kv_variant_list ; do - eval list=\$modules_$(shell_var "$x") - [ -n "$list" ] && break - done - [ -z "$list" ] && list=$modules - - for x in $list; do - a=${x#*:} - if [ "$a" = "$x" ]; then - unset mpargs - ebegin "Loading module $x" - else - x=${x%%:*} - mpargs="-o $a" - ebegin "Loading module $x as $a" - fi - aa=$(shell_var "$a") - xx=$(shell_var "$x") - for y in $kv_variant_list ; do - eval args=\$module_${aa}_args_$(shell_var "$y") - [ -n "${args}" ] && break - eval args=\$module_${xx}_args_$(shell_var "$y") - [ -n "${args}" ] && break - done - [ -z "$args" ] && eval args=\$module_${aa}_args - [ -z "$args" ] && eval args=\$module_${xx}_args - eval modprobe -q "$mpargs" "$x" "$args" - eend $? "Failed to load $x" && : $(( cnt += 1 )) - done - einfo "Autoloaded $cnt module(s)" -} diff --git a/init.d/._cfg0000_numlock b/init.d/._cfg0000_numlock deleted file mode 100755 index 4f7e830..0000000 --- a/init.d/._cfg0000_numlock +++ /dev/null @@ -1,42 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Turns numlock on for the consoles." - -ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} - -depend() -{ - need localmount - keyword -openvz -prefix -vserver -lxc -} - -_setleds() -{ - [ -z "$1" ] && return 1 - - local dev=/dev/tty t= i=1 retval=0 - [ -d /dev/vc ] && dev=/dev/vc/ - - while [ $i -le $ttyn ]; do - setleds -D "$1"num < $dev$i || retval=1 - : $(( i += 1 )) - done - - return $retval -} - -start() -{ - ebegin "Enabling numlock on ttys" - _setleds + - eend $? "Failed to enable numlock" -} - -stop() -{ - ebegin "Disabling numlock on ttys" - _setleds - - eend $? "Failed to disable numlock" -} diff --git a/init.d/._cfg0000_root b/init.d/._cfg0000_root deleted file mode 100755 index d431022..0000000 --- a/init.d/._cfg0000_root +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Mount the root fs read/write" - -depend() -{ - need fsck - keyword -jail -openvz -prefix -vserver -lxc -} - -start() -{ - case ",$(fstabinfo -o /)," in - *,ro,*) - ;; - *) - # Check if the rootfs isn't already writable. - if checkpath -W /; then - rm -f /fastboot /forcefsck - else - ebegin "Remounting root filesystem read/write" - case "$RC_UNAME" in - Linux) - mount -n -o remount,rw / - ;; - *) - mount -u -o rw / - ;; - esac - eend $? "Root filesystem could not be mounted read/write" - if [ $? -eq 0 ]; then - rm -f /fastboot /forcefsck - fi - fi - ;; - esac - - ebegin "Remounting filesystems" - local mountpoint - for mountpoint in $(fstabinfo); do - case "${mountpoint}" in - /) - ;; - /*) - mountinfo -q "${mountpoint}" && \ - fstabinfo --remount "${mountpoint}" - ;; - esac - done - eend 0 -} diff --git a/init.d/._cfg0000_rpc.statd b/init.d/._cfg0000_rpc.statd deleted file mode 100755 index c82041a..0000000 --- a/init.d/._cfg0000_rpc.statd +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $ - -[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs - -rpc_bin=/sbin/rpc.statd -rpc_pid=/var/run/rpc.statd.pid - -depend() { - use ypbind net - need portmap - after quota -} - -start() { - # Don't start rpc.statd if already started by someone else ... - # Don't try and kill it if it's already dead ... - if killall -q -0 ${rpc_bin} ; then - return 0 - fi - - ebegin "Starting NFS statd" - start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} - eend $? -} - -stop() { - ebegin "Stopping NFS statd" - start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid - eend $? -} diff --git a/init.d/._cfg0000_swap b/init.d/._cfg0000_swap deleted file mode 100755 index 5d68dd9..0000000 --- a/init.d/._cfg0000_swap +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -depend() -{ - before localmount - keyword -jail -openvz -prefix -vserver -lxc -} - -start() -{ - ebegin "Activating swap devices" - case "$RC_UNAME" in - Linux) swapon -a -e >/dev/null;; - NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; - *) swapon -a >/dev/null;; - esac - eend 0 # If swapon has nothing todo it errors, so always return 0 -} - -stop() -{ - ebegin "Deactivating swap devices" - - # Try to unmount all tmpfs filesystems not in use, else a deadlock may - # occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it - cd "$RC_SVCDIR" - umount -a -t tmpfs 2>/dev/null - - case "$RC_UNAME" in - NetBSD|OpenBSD) swapctl -U -t noblk >/dev/null;; - *) swapoff -a >/dev/null;; - esac - eend 0 -} diff --git a/init.d/._cfg0000_swapfiles b/init.d/._cfg0000_swapfiles deleted file mode 100755 index 754ae1d..0000000 --- a/init.d/._cfg0000_swapfiles +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -depend() -{ - need localmount - keyword -jail -openvz -prefix -vserver -lxc -} - -start() -{ - ebegin "Activating additional swap space" - case "$RC_UNAME" in - NetBSD|OpenBSD) swapctl -A -t noblk >/dev/null;; - *) swapon -a >/dev/null;; - esac - eend 0 # If swapon has nothing todo it errors, so always return 0 -} - -stop() -{ - ebegin "Deactivating additional swap space" - case "$RC_UNAME" in - Linux) - if [ -e /proc/swaps ]; then - while read filename type rest; do - case "$type" in - file) swapoff $filename >/dev/null;; - esac - case "$filename" in - /dev/loop*) swapoff $filename >/dev/null;; - esac - done < /proc/swaps - fi - ;; - esac - eend 0 -} diff --git a/init.d/._cfg0000_termencoding b/init.d/._cfg0000_termencoding deleted file mode 100755 index ddd5bb0..0000000 --- a/init.d/._cfg0000_termencoding +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2008-2009 Roy Marples -# Released under the 2-clause BSD license. - -description="Configures terminal encoding." - -ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} -: ${unicode:=${UNICODE}} - -depend() -{ - keyword -lxc -openvz -prefix -uml -vserver -xenu - use root - after bootmisc -} - -start() -{ - local ttydev=/dev/tty n= - [ -d /dev/vc ] && ttydev=/dev/vc/ - - # Set terminal encoding to either ASCII or UNICODE. - # See utf-8(7) for more information. - local termencoding="%@" termmsg="ASCII" - if yesno ${unicode}; then - termencoding="%G" - termmsg="UTF-8" - fi - - ebegin "Setting terminal encoding [$termmsg]" - n=1 - while [ ${n} -le "$ttyn" ]; do - printf "\033%s" "$termencoding" >$ttydev$n - : $(( n += 1 )) - done - - # Save the encoding for use immediately at boot - if checkpath -W "$RC_LIBEXECDIR"; then - mkdir -p "$RC_LIBEXECDIR"/console - if yesno ${unicode:-${UNICODE}}; then - echo "" > "$RC_LIBEXECDIR"/console/unicode - else - rm -f "$RC_LIBEXECDIR"/console/unicode - fi - fi - - eend 0 -} diff --git a/init.d/._cfg0000_urandom b/init.d/._cfg0000_urandom deleted file mode 100755 index 780db12..0000000 --- a/init.d/._cfg0000_urandom +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2007-2009 Roy Marples -# Released under the 2-clause BSD license. - -: ${urandom_seed:=${URANDOM_SEED:-/var/lib/misc/random-seed}} -description="Initializes the random number generator." - -depend() -{ - need localmount - keyword -jail -lxc -openvz -prefix -} - -save_seed() -{ - local psz=1 - - if [ -e /proc/sys/kernel/random/poolsize ]; then - : $(( psz = $(cat /proc/sys/kernel/random/poolsize) / 4096 )) - fi - - ( # sub shell to prevent umask pollution - umask 077 - dd if=/dev/urandom of="$urandom_seed" count=${psz} 2>/dev/null - ) -} - -start() -{ - [ -c /dev/urandom ] || return - if [ -f "$urandom_seed" ]; then - ebegin "Initializing random number generator" - cat "$urandom_seed" > /dev/urandom - eend $? "Error initializing random number generator" - fi - rm -f "$urandom_seed" && save_seed - return 0 -} - -stop() -{ - ebegin "Saving random seed" - save_seed - eend $? "Failed to save random seed" -} diff --git a/init.d/consolefont b/init.d/consolefont index 2ef35e7..47bf2a4 100755 --- a/init.d/consolefont +++ b/init.d/consolefont @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/dmesg b/init.d/dmesg index a4083d0..98c2c43 100755 --- a/init.d/dmesg +++ b/init.d/dmesg @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/fsck b/init.d/fsck index c2e883d..0130376 100755 --- a/init.d/fsck +++ b/init.d/fsck @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/hostname b/init.d/hostname index fb6260f..7d2a2d9 100755 --- a/init.d/hostname +++ b/init.d/hostname @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/keymaps b/init.d/keymaps index 507424b..0cadd7d 100755 --- a/init.d/keymaps +++ b/init.d/keymaps @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/killprocs b/init.d/killprocs index 5552b97..f07de69 100755 --- a/init.d/killprocs +++ b/init.d/killprocs @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2008 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/modules b/init.d/modules index 17f60ce..15f98b0 100755 --- a/init.d/modules +++ b/init.d/modules @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/numlock b/init.d/numlock index e354dfd..4f7e830 100755 --- a/init.d/numlock +++ b/init.d/numlock @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/root b/init.d/root index 04687c6..d431022 100755 --- a/init.d/root +++ b/init.d/root @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/rpc.statd b/init.d/rpc.statd index 14f8b34..c82041a 100755 --- a/init.d/rpc.statd +++ b/init.d/rpc.statd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $ [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs diff --git a/init.d/swap b/init.d/swap index 309d37b..5d68dd9 100755 --- a/init.d/swap +++ b/init.d/swap @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/swapfiles b/init.d/swapfiles index 8a851fa..754ae1d 100755 --- a/init.d/swapfiles +++ b/init.d/swapfiles @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/termencoding b/init.d/termencoding index b949b76..ddd5bb0 100755 --- a/init.d/termencoding +++ b/init.d/termencoding @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2008-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/init.d/urandom b/init.d/urandom index 4bfecab..780db12 100755 --- a/init.d/urandom +++ b/init.d/urandom @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright (c) 2007-2009 Roy Marples # Released under the 2-clause BSD license. diff --git a/modprobe.d/._cfg0000_nvidia.conf b/modprobe.d/._cfg0000_nvidia.conf deleted file mode 100644 index 1e439d4..0000000 --- a/modprobe.d/._cfg0000_nvidia.conf +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/nvidia-drivers-346.35/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=27 NVreg_ModifyDeviceFiles=1 diff --git a/modprobe.d/._cfg0001_nvidia.conf b/modprobe.d/._cfg0001_nvidia.conf deleted file mode 100644 index 55a57c6..0000000 --- a/modprobe.d/._cfg0001_nvidia.conf +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/nvidia-drivers-343.36/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=27 NVreg_ModifyDeviceFiles=1 diff --git a/modprobe.d/nvidia.conf b/modprobe.d/nvidia.conf index 85098bf..55a57c6 100644 --- a/modprobe.d/nvidia.conf +++ b/modprobe.d/nvidia.conf @@ -4,7 +4,7 @@ alias /dev/nvidiactl char-major-195 # To tweak the driver the following options can be used, note that # you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/nvidia-drivers-346.22/README +# options see /usr/share/doc/nvidia-drivers-343.36/README # # !!! SECURITY WARNING !!! # DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW diff --git a/nvidia/._cfg0000_nvidia-application-profiles-rc b/nvidia/._cfg0000_nvidia-application-profiles-rc deleted file mode 100644 index 9fcc392..0000000 --- a/nvidia/._cfg0000_nvidia-application-profiles-rc +++ /dev/null @@ -1,85 +0,0 @@ -# Application profiles for the NVIDIA Linux graphics driver, version 346.35 -# Last modified: Sat Jan 10 20:57:22 PST 2015 -# These profiles were provided by NVIDIA and should not be modified. If you -# wish to change the defaults provided here, you can override them by creating -# custom rules in /etc/nvidia/nvidia-application-profiles-rc (which will apply -# system-wide) or, for a given user, $HOME/.nv/nvidia-application-profiles-rc -# (which will apply to that particular user). See the "APPLICATION PROFILE -# SEARCH PATH" section of the NVIDIA Linux Graphics Driver README for more -# information. -{ - "profiles" : [ - { - "name" : "NonConformantBlitFramebufferScissor", - "settings" : [ "GLConformantBlitFramebufferScissor", false ] - }, - { - "name" : "CL1C", - "settings" : [ "0x528ab3", 1 ] - }, - { - "name" : "FA0", - "settings" : [ "10572898", 0 ] - }, - { - "name" : "ExactGLESVersion", - "settings" : [ "ForceRequestedESVersion", 1 ] - }, - { - "name" : "IgnoreGLSLExtensionRequirements", - "settings" : [ "GLIgnoreGLSLExtReqs", true ] - }, - { - "name" : "No GSYNC", - "settings" : [ "GLGSYNCAllowed", false ] - } - ], - "rules" : [ - { - "pattern" : { - "feature" : "dso", - "matches" : "libcogl.so" - }, - "profile" : "NonConformantBlitFramebufferScissor" - }, - { - "pattern" : { - "feature" : "dso", - "matches" : "libMaya.so" - }, - "profile" : "CL1C" - }, - { "pattern" : "xsi", "profile" : "CL1C" }, - { "pattern" : "HoudiniFX", "profile" : "CL1C" }, - { "pattern" : "katana", "profile" : "CL1C" }, - { "pattern" : "Autodesk Mudbox 2014 64-bit", "profile" : "CL1C" }, - { "pattern" : "octane", "profile" : "CL1C" }, - { "pattern" : "Fusion64_6.4", "profile" : "CL1C" }, - { "pattern" : "Nuke7.0", "profile" : "CL1C" }, - { "pattern" : "vray.exe", "profile" : "CL1C" }, - { "pattern" : "vray.bin", "profile" : "CL1C" }, - { "pattern" : "kwin_gles", "profile" : "FA0" }, - { "pattern" : "kwin_gles", "profile" : "ExactGLESVersion" }, - { - "pattern" : [ - { "feature" : "procname", "matches" : "heaven_x86"}, - { "op" : "not", "sub" : { "feature" : "findfile", "matches" : "browser_x86" } } - ], - "profile" : "IgnoreGLSLExtensionRequirements" - }, - { - "pattern" : [ - { "feature" : "procname", "matches" : "heaven_x64"}, - { "op" : "not", "sub" : { "feature" : "findfile", "matches" : "browser_x64" } } - ], - "profile" : "IgnoreGLSLExtensionRequirements" - }, - { "pattern" : { "feature" : "procname", "matches" : "cinnamon" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "compiz" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "enlightenment" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "gnome-shell" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "kwin" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "muffin" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "dso", "matches" : "libmutter.so" }, "profile" : "No GSYNC" } - ] -} diff --git a/nvidia/._cfg0001_nvidia-application-profiles-rc b/nvidia/._cfg0001_nvidia-application-profiles-rc deleted file mode 100644 index d8ece9d..0000000 --- a/nvidia/._cfg0001_nvidia-application-profiles-rc +++ /dev/null @@ -1,85 +0,0 @@ -# Application profiles for the NVIDIA Linux graphics driver, version 343.36 -# Last modified: Mon Dec 1 15:53:39 PST 2014 -# These profiles were provided by NVIDIA and should not be modified. If you -# wish to change the defaults provided here, you can override them by creating -# custom rules in /etc/nvidia/nvidia-application-profiles-rc (which will apply -# system-wide) or, for a given user, $HOME/.nv/nvidia-application-profiles-rc -# (which will apply to that particular user). See the "APPLICATION PROFILE -# SEARCH PATH" section of the NVIDIA Linux Graphics Driver README for more -# information. -{ - "profiles" : [ - { - "name" : "NonConformantBlitFramebufferScissor", - "settings" : [ "GLConformantBlitFramebufferScissor", false ] - }, - { - "name" : "CL1C", - "settings" : [ "0x528ab3", 1 ] - }, - { - "name" : "FA0", - "settings" : [ "10572898", 0 ] - }, - { - "name" : "ExactGLESVersion", - "settings" : [ "ForceRequestedESVersion", 1 ] - }, - { - "name" : "IgnoreGLSLExtensionRequirements", - "settings" : [ "GLIgnoreGLSLExtReqs", true ] - }, - { - "name" : "No GSYNC", - "settings" : [ "GLGSYNCAllowed", false ] - } - ], - "rules" : [ - { - "pattern" : { - "feature" : "dso", - "matches" : "libcogl.so" - }, - "profile" : "NonConformantBlitFramebufferScissor" - }, - { - "pattern" : { - "feature" : "dso", - "matches" : "libMaya.so" - }, - "profile" : "CL1C" - }, - { "pattern" : "xsi", "profile" : "CL1C" }, - { "pattern" : "HoudiniFX", "profile" : "CL1C" }, - { "pattern" : "katana", "profile" : "CL1C" }, - { "pattern" : "Autodesk Mudbox 2014 64-bit", "profile" : "CL1C" }, - { "pattern" : "octane", "profile" : "CL1C" }, - { "pattern" : "Fusion64_6.4", "profile" : "CL1C" }, - { "pattern" : "Nuke7.0", "profile" : "CL1C" }, - { "pattern" : "vray.exe", "profile" : "CL1C" }, - { "pattern" : "vray.bin", "profile" : "CL1C" }, - { "pattern" : "kwin_gles", "profile" : "FA0" }, - { "pattern" : "kwin_gles", "profile" : "ExactGLESVersion" }, - { - "pattern" : [ - { "feature" : "procname", "matches" : "heaven_x86"}, - { "op" : "not", "sub" : { "feature" : "findfile", "matches" : "browser_x86" } } - ], - "profile" : "IgnoreGLSLExtensionRequirements" - }, - { - "pattern" : [ - { "feature" : "procname", "matches" : "heaven_x64"}, - { "op" : "not", "sub" : { "feature" : "findfile", "matches" : "browser_x64" } } - ], - "profile" : "IgnoreGLSLExtensionRequirements" - }, - { "pattern" : { "feature" : "procname", "matches" : "cinnamon" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "compiz" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "enlightenment" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "gnome-shell" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "kwin" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "procname", "matches" : "muffin" }, "profile" : "No GSYNC" }, - { "pattern" : { "feature" : "dso", "matches" : "libmutter.so" }, "profile" : "No GSYNC" } - ] -} diff --git a/nvidia/nvidia-application-profiles-rc b/nvidia/nvidia-application-profiles-rc index 057cd55..d8ece9d 100644 --- a/nvidia/nvidia-application-profiles-rc +++ b/nvidia/nvidia-application-profiles-rc @@ -1,5 +1,5 @@ -# Application profiles for the NVIDIA Linux graphics driver, version 346.22 -# Last modified: Tue Dec 2 10:23:58 PST 2014 +# Application profiles for the NVIDIA Linux graphics driver, version 343.36 +# Last modified: Mon Dec 1 15:53:39 PST 2014 # These profiles were provided by NVIDIA and should not be modified. If you # wish to change the defaults provided here, you can override them by creating # custom rules in /etc/nvidia/nvidia-application-profiles-rc (which will apply diff --git a/postfix/._cfg0000_master.cf b/postfix/._cfg0000_master.cf deleted file mode 100644 index 4a3b2f9..0000000 --- a/postfix/._cfg0000_master.cf +++ /dev/null @@ -1,130 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master" or -# on-line: http://www.postfix.org/master.5.html). -# -# Do not forget to execute "postfix reload" after editing this file. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (no) (never) (100) -# ========================================================================== -smtp inet n - n - - smtpd -#smtp inet n - n - 1 postscreen -#smtpd pass - - n - - smtpd -#dnsblog unix - - n - 0 dnsblog -#tlsproxy unix - - n - 0 tlsproxy -#submission inet n - n - - smtpd -# -o syslog_name=postfix/submission -# -o smtpd_tls_security_level=encrypt -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#smtps inet n - n - - smtpd -# -o syslog_name=postfix/smtps -# -o smtpd_tls_wrappermode=yes -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#628 inet n - n - - qmqpd -pickup unix n - n 60 1 pickup -cleanup unix n - n - 0 cleanup -qmgr unix n - n 300 1 qmgr -#qmgr unix n - n 300 1 oqmgr -tlsmgr unix - - n 1000? 1 tlsmgr -rewrite unix - - n - - trivial-rewrite -bounce unix - - n - 0 bounce -defer unix - - n - 0 bounce -trace unix - - n - 0 bounce -verify unix - - n - 1 verify -flush unix n - n 1000? 0 flush -proxymap unix - - n - - proxymap -proxywrite unix - - n - 1 proxymap -smtp unix - - n - - smtp -relay unix - - n - - smtp -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - n - - showq -error unix - - n - - error -retry unix - - n - - error -discard unix - - n - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - n - - lmtp -anvil unix - - n - 1 anvil -scache unix - - n - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -#maildrop unix - n n - - pipe -# flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} -# -# ==================================================================== -# -# Recent Cyrus versions can use the existing "lmtp" master.cf entry. -# -# Specify in cyrus.conf: -# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 -# -# Specify in main.cf one or more of the following: -# mailbox_transport = lmtp:inet:localhost -# virtual_transport = lmtp:inet:localhost -# -# ==================================================================== -# -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -# -#cyrus unix - n n - - pipe -# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -# -# ==================================================================== -# -# Old example of delivery via Cyrus. -# -#old-cyrus unix - n n - - pipe -# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} -# -# ==================================================================== -# -# See the Postfix UUCP_README file for configuration details. -# -#uucp unix - n n - - pipe -# flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# ==================================================================== -# -# Other external delivery methods. -# -#ifmail unix - n n - - pipe -# flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -# -#bsmtp unix - n n - - pipe -# flags=Fq. user=bsmtp argv=/usr/sbin/bsmtp -f $sender $nexthop $recipient -# -#scalemail-backend unix - n n - 2 pipe -# flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store -# ${nexthop} ${user} ${extension} -# -#mailman unix - n n - - pipe -# flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py -# ${nexthop} ${user} diff --git a/postfix/master.cf b/postfix/master.cf index 79ca4bb..4a3b2f9 100644 --- a/postfix/master.cf +++ b/postfix/master.cf @@ -7,7 +7,7 @@ # # ========================================================================== # service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (yes) (never) (100) +# (yes) (yes) (no) (never) (100) # ========================================================================== smtp inet n - n - - smtpd #smtp inet n - n - 1 postscreen diff --git a/profile b/profile index 6847b85..2dee463 100644 --- a/profile +++ b/profile @@ -14,7 +14,6 @@ fi # 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} -#export GREP_OPTIONS="--directories=skip" # 077 would be more secure, but 022 is generally quite realistic umask 022