]> Frank Brehm's Git Trees - config/bruni/etc.git/commitdiff
Current state
authorFrank Brehm <frank@brehm-online.com>
Thu, 29 May 2014 06:35:09 +0000 (08:35 +0200)
committerFrank Brehm <frank@brehm-online.com>
Thu, 29 May 2014 06:35:09 +0000 (08:35 +0200)
14 files changed:
conf.d/cpufrequtils [deleted file]
conf.d/cpupower [new file with mode: 0644]
config-archive/etc/inittab.dist [new file with mode: 0644]
config-archive/etc/inittab.dist.new [deleted file]
csh.env
cups/printers.conf
env.d/01cvs [new file with mode: 0644]
init.d/cpufrequtils [deleted file]
init.d/cpupower [new file with mode: 0755]
init.d/crypto-loop [deleted file]
inittab
portage/package.use
profile.env
xinetd.d/cvspserver [deleted file]

diff --git a/conf.d/cpufrequtils b/conf.d/cpufrequtils
deleted file mode 100644 (file)
index 8959664..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
-
-# Options when starting cpufreq (given to the `cpufreq-set` program)
-START_OPTS="--governor ondemand"
-
-# Options when stopping cpufreq (given to the `cpufreq-set` program)
-STOP_OPTS="--governor performance"
-
-# Extra settings to write to sysfs cpufreq values.
-#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=70"
-
diff --git a/conf.d/cpupower b/conf.d/cpupower
new file mode 100644 (file)
index 0000000..1e67ed0
--- /dev/null
@@ -0,0 +1,36 @@
+# /etc/conf.d/cpupower: config file for /etc/init.d/cpupower
+
+# Options when starting cpufreq (given to the `cpupower` program)
+# Possible options are:
+# -g --governor <GOV> (ie: ondemand, performance, or powersave)
+# -d --min <FREQ> (ie: 1000MHz)
+# -u --max <FREQ> (ie: 2000MHz)
+# -f --freq <FREQ> (requires userspace governor, this *can not* be combined with
+#                   with any other parameters).
+# Frequencies can be passed in Hz, kHz (default), MHz, GHz, or THz by postfixing the
+# value with  the  wanted  unit name, without any space.
+# (frequency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).
+
+START_OPTS="--governor ondemand"
+
+# Options when stopping cpufreq (given to the `cpupower` program)
+# This option can be used to change governer on stop. Leaving it empty will ensure
+# the governer remains on the one provided above.
+STOP_OPTS=""
+
+# Extra settings to write to sysfs cpufreq values.
+#
+# up_threshold: threshold for stepping up frequency, where the value represents
+# the percentage of cpu load. 
+#
+# down_threshold: threshold for stepping down frequency, where the value
+# represents the percentage of cpu load.
+#
+# sampling_down_factor: determines how frequently the governor polls the cpu, a
+# value greater than 1 improves performance by reducing the polling when the
+# load is high. This tunable has no effect on behavior at lower CPU frequencies.
+#
+# ignore_nice_load: when set to '1' the processes that are run with a 'nice'
+# value will not count in the usage calculation.
+
+#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=75 ondemand/sampling_down_factor=10"
diff --git a/config-archive/etc/inittab.dist b/config-archive/etc/inittab.dist
new file mode 100644 (file)
index 0000000..aa588b6
--- /dev/null
@@ -0,0 +1,58 @@
+#
+# /etc/inittab:  This file describes how the INIT process should set up
+#                the system in a certain run-level.
+#
+# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
+# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
+# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
+# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
+# Modified by:  Mike Frysinger, <vapier@gentoo.org>
+# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
+#
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
+
+# Default runlevel.
+id:3:initdefault:
+
+# System initialization, mount local filesystems, etc.
+si::sysinit:/sbin/rc sysinit
+
+# Further system initialization, brings up the boot runlevel.
+rc::bootwait:/sbin/rc boot
+
+l0:0:wait:/sbin/rc shutdown 
+l0s:0:wait:/sbin/halt -dhp
+l1:1:wait:/sbin/rc single
+l2:2:wait:/sbin/rc nonetwork
+l3:3:wait:/sbin/rc default
+l4:4:wait:/sbin/rc default
+l5:5:wait:/sbin/rc default
+l6:6:wait:/sbin/rc reboot
+l6r:6:wait:/sbin/reboot -dk
+#z6:6:respawn:/sbin/sulogin
+
+# new-style single-user
+su0:S:wait:/sbin/rc single
+su1:S:wait:/sbin/sulogin
+
+# TERMINALS
+c1:12345:respawn:/sbin/agetty 38400 tty1 linux
+c2:2345:respawn:/sbin/agetty 38400 tty2 linux
+c3:2345:respawn:/sbin/agetty 38400 tty3 linux
+c4:2345:respawn:/sbin/agetty 38400 tty4 linux
+c5:2345:respawn:/sbin/agetty 38400 tty5 linux
+c6:2345:respawn:/sbin/agetty 38400 tty6 linux
+
+# SERIAL CONSOLES
+#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100
+
+# What to do at the "Three Finger Salute".
+ca:12345:ctrlaltdel:/sbin/shutdown -r now
+
+# Used by /etc/init.d/xdm to control DM startup.
+# Read the comments in /etc/init.d/xdm for more
+# info. Do NOT remove, as this will start nothing
+# extra at boot if /etc/init.d/xdm is not added
+# to the "default" runlevel.
+x:a:once:/etc/X11/startDM.sh
diff --git a/config-archive/etc/inittab.dist.new b/config-archive/etc/inittab.dist.new
deleted file mode 100644 (file)
index 2f6af66..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/rc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 115200 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
-
diff --git a/csh.env b/csh.env
index 54e0b4632d43ec9286198570531aa549e52e3da5..b5e85356ca801107c119d6f9ff8788847c458083 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -5,6 +5,7 @@
 setenv ANT_HOME '/usr/share/ant'
 setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+setenv CVS_RSH 'ssh'
 setenv EDITOR '/usr/bin/vim'
 setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.2/html'
 setenv GCC_SPECS ''
index c96ae7dfd41d9912fde6f10a316b60a2893e7bb5..ba758cd7de5e4f8cad03a2647f6991b54eeb744d 100644 (file)
@@ -1,5 +1,5 @@
 # Printer configuration file for CUPS v1.7.1
-# Written by cupsd on 2014-05-09 17:19
+# Written by cupsd on 2014-05-23 07:47
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
 <Printer Bla_blub>
 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d
diff --git a/env.d/01cvs b/env.d/01cvs
new file mode 100644 (file)
index 0000000..5c89358
--- /dev/null
@@ -0,0 +1 @@
+CVS_RSH="ssh"
diff --git a/init.d/cpufrequtils b/init.d/cpufrequtils
deleted file mode 100755 (executable)
index a17c4a4..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-init.d-007,v 1.2 2013/05/06 11:09:09 lxnay Exp $
-
-change() {
-       ebegin "Running cpufreq-set ${*}"
-       /usr/libexec/cpufrequtils-change.sh "${@}" > /dev/null
-       eend $?
-}
-
-start() {
-       change ${START_OPTS} -- ${SYSFS_EXTRA}
-}
-
-stop() {
-       change "${STOP_OPTS}"
-}
diff --git a/init.d/cpupower b/init.d/cpupower
new file mode 100755 (executable)
index 0000000..789945b
--- /dev/null
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/files/init.d-r4,v 1.1 2013/12/25 11:46:32 ssuominen Exp $
+
+CPUFREQ_SYSFS=/sys/devices/system/cpu/cpufreq
+
+change() {
+       local c ret=0 opts="$1"
+       if [ -n "$opts" ] ; then
+               ebegin "Running cpupower -c all frequency-set ${opts}"
+                       cpupower -c all frequency-set ${opts} >/dev/null 2>&1
+                       : $(( ret += $? ))
+               eend ${ret}
+
+               if [ -d ${CPUFREQ_SYSFS} ] && [ -n "${SYSFS_EXTRA}" ] ; then
+                       c=1
+                       einfo "Setting extra options: ${SYSFS_EXTRA}"
+                       if cd ${CPUFREQ_SYSFS} ; then
+                               local o v
+                               for o in ${SYSFS_EXTRA} ; do
+                                       v=${o#*=}
+                                       o=${o%%=*}
+                                       echo ${v} > ${o} || break
+                               done
+                               c=0
+                       fi
+                       eend ${c}
+                       : $(( ret += c ))
+               fi
+       fi
+
+       return ${ret}
+}
+
+start() {
+       change "${START_OPTS}"
+}
+
+stop() {
+       change "${STOP_OPTS}"
+}
diff --git a/init.d/crypto-loop b/init.d/crypto-loop
deleted file mode 100755 (executable)
index 853bae2..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $
-
-depend() {
-       if [ -x /etc/init.d/root ]; then
-               need root
-       else
-               need checkroot
-       fi
-       need modules
-       before localmount
-}
-
-start() {
-       local status="0"
-
-       ebegin "Starting crypto loop devices"
-
-       if [ -e /etc/conf.d/crypto-loop ] ; then
-               egrep "^loop" /etc/conf.d/crypto-loop | \
-               while read loopline ; do
-                       eval ${loopline}
-
-                       local configured=$(awk -v MOUNT="${device}" \
-                               '($2 == MOUNT) { print "yes" }' /proc/mounts)
-
-                       if [ "${configured}" != "yes" ] ; then
-                               einfo "  Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): "
-
-                               if [ -n "${hash}" ] ; then
-                                       /usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\
-                                       /sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
-                               else
-                                       /sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
-                               fi
-
-                               if [ $? -ne 0 ] ; then
-                                       ewarn "Failure configuring ${loop}.  Skipping."
-                                       status=1
-                               fi
-                       else
-                               ewarn "  Loop ${loop} on device ${device} are already configured"
-                       fi
-               done
-       fi
-       ewend ${status} "Failed to start some loop devices."
-
-       # We do not fail if some loop devices did not start ...
-       return 0
-}
-
-stop() {
-       local status="0"
-       for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
-               losetup ${loop} > /dev/null 2>&1
-               if [ $? -eq 0 ] ; then
-                       ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
-                       if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
-                               ewarn "Failure deconfiguring ${loop}."
-                               status=1
-                       fi
-               fi
-       done
-       ewend ${status}
-}
-
-
-# vim:ts=4
diff --git a/inittab b/inittab
index fe9bd62df2017343b095c5709f60053347043a21..ab61c6308b38631604bc8164bdd685a3300232fb 100644 (file)
--- a/inittab
+++ b/inittab
@@ -9,7 +9,7 @@
 # Modified by:  Mike Frysinger, <vapier@gentoo.org>
 # Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
 
 # Default runlevel.
 id:3:initdefault:
@@ -44,8 +44,8 @@ c5:2345:respawn:/sbin/agetty 38400 tty5 linux
 c6:2345:respawn:/sbin/agetty 38400 tty6 linux
 
 # SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
+#s0:12345:respawn:/sbin/agetty -L 115200 ttyS0 vt100
+#s1:12345:respawn:/sbin/agetty -L 115200 ttyS1 vt100
 
 # What to do at the "Three Finger Salute".
 ca:12345:ctrlaltdel:/sbin/shutdown -r now
@@ -56,4 +56,3 @@ ca:12345:ctrlaltdel:/sbin/shutdown -r now
 # extra at boot if /etc/init.d/xdm is not added
 # to the "default" runlevel.
 x:a:once:/etc/X11/startDM.sh
-
index 983bbbe70df9457d41a69fe3a887e6aaa2167f91..0dbd9f2b1f249f435e8e8cb1cabb417f3e2be39a 100644 (file)
@@ -281,7 +281,7 @@ sys-block/parted                    device-mapper
 sys-apps/pciutils                      network-cron -zlib
 sys-apps/portage                       epydoc python3
 sys-apps/usbutils                      network-cron
-sys-apps/util-linux                    ddate loop-aes
+sys-apps/util-linux                    ddate loop-aes tty-helpers
 
 sys-auth/consolekit                    policykit
 sys-auth/pambase                       mktemp pam_krb5 pam_ssh
index 1b23c8a9701aa7c5fbabff6afab2b9fee920fe6f..ab2657e6196ece38341c0d10f41ff2d79167e5f0 100644 (file)
@@ -5,6 +5,7 @@
 export ANT_HOME='/usr/share/ant'
 export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt /var/lib/hsqldb /usr/share/config'
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/apache2-php5.3/ext-active/ /etc/php/cli-php5.5/ext-active/ /etc/php/cgi-php5.5/ext-active/ /etc/php/apache2-php5.5/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/ca-certificates.conf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
+export CVS_RSH='ssh'
 export EDITOR='/usr/bin/vim'
 export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.2/html'
 export GCC_SPECS=''
diff --git a/xinetd.d/cvspserver b/xinetd.d/cvspserver
deleted file mode 100644 (file)
index 0f2edb0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-service cvspserver
-{
-       disable         = yes
-       socket_type     = stream
-       wait            = no
-       user            = root
-       log_type        = FILE /var/log/cvspserver
-       protocol        = tcp
-       env             = HOME=/var/cvsroot
-       log_on_failure  += USERID
-       port            = 2401
-       server          = /usr/bin/cvs
-       server_args     = -f --allow-root=/var/cvsroot pserver
-}