From a0f4e1bff23fb2b11d5c5a5e915ba3644f03d4c5 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 29 May 2014 08:35:09 +0200 Subject: [PATCH] Current state --- conf.d/cpufrequtils | 11 --- conf.d/cpupower | 36 ++++++++++ .../etc/{inittab.dist.new => inittab.dist} | 7 +- csh.env | 1 + cups/printers.conf | 2 +- env.d/01cvs | 1 + init.d/cpufrequtils | 18 ----- init.d/cpupower | 42 +++++++++++ init.d/crypto-loop | 70 ------------------- inittab | 7 +- portage/package.use | 2 +- profile.env | 1 + xinetd.d/cvspserver | 14 ---- 13 files changed, 89 insertions(+), 123 deletions(-) delete mode 100644 conf.d/cpufrequtils create mode 100644 conf.d/cpupower rename config-archive/etc/{inittab.dist.new => inittab.dist} (91%) create mode 100644 env.d/01cvs delete mode 100755 init.d/cpufrequtils create mode 100755 init.d/cpupower delete mode 100755 init.d/crypto-loop delete mode 100644 xinetd.d/cvspserver diff --git a/conf.d/cpufrequtils b/conf.d/cpufrequtils deleted file mode 100644 index 89596644..00000000 --- a/conf.d/cpufrequtils +++ /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 index 00000000..1e67ed04 --- /dev/null +++ b/conf.d/cpupower @@ -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 (ie: ondemand, performance, or powersave) +# -d --min (ie: 1000MHz) +# -u --max (ie: 2000MHz) +# -f --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.new b/config-archive/etc/inittab.dist similarity index 91% rename from config-archive/etc/inittab.dist.new rename to config-archive/etc/inittab.dist index 2f6af664..aa588b6a 100644 --- a/config-archive/etc/inittab.dist.new +++ b/config-archive/etc/inittab.dist @@ -9,7 +9,7 @@ # Modified by: Mike Frysinger, # Modified by: Robin H. Johnson, # -# $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 115200 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty 115200 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 - diff --git a/csh.env b/csh.env index 54e0b463..b5e85356 100644 --- 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 '' diff --git a/cups/printers.conf b/cups/printers.conf index c96ae7df..ba758cd7 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -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 UUID urn:uuid:37ccb9f9-f39f-3442-414c-7de19e42748d diff --git a/env.d/01cvs b/env.d/01cvs new file mode 100644 index 00000000..5c89358b --- /dev/null +++ b/env.d/01cvs @@ -0,0 +1 @@ +CVS_RSH="ssh" diff --git a/init.d/cpufrequtils b/init.d/cpufrequtils deleted file mode 100755 index a17c4a47..00000000 --- a/init.d/cpufrequtils +++ /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 index 00000000..789945b0 --- /dev/null +++ b/init.d/cpupower @@ -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 index 853bae27..00000000 --- a/init.d/crypto-loop +++ /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/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 fe9bd62d..ab61c630 100644 --- a/inittab +++ b/inittab @@ -9,7 +9,7 @@ # Modified by: Mike Frysinger, # Modified by: Robin H. Johnson, # -# $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 - diff --git a/portage/package.use b/portage/package.use index 983bbbe7..0dbd9f2b 100644 --- a/portage/package.use +++ b/portage/package.use @@ -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 diff --git a/profile.env b/profile.env index 1b23c8a9..ab2657e6 100644 --- a/profile.env +++ b/profile.env @@ -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 index 0f2edb09..00000000 --- a/xinetd.d/cvspserver +++ /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 -} -- 2.39.5