From da2444d5ad2255e4b85be5d7d68b457fca0aa8d9 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 22 May 2014 13:51:44 +0200 Subject: [PATCH] Current state --- .etckeeper | 4 +- config-archive/etc/inittab | 4 +- config-archive/etc/inittab.dist | 7 ++-- csh.env | 1 + init.d/crypto-loop | 70 --------------------------------- inittab | 7 ++-- portage/package.use | 2 +- profile.env | 1 + xinetd.d/cvspserver | 14 ------- 9 files changed, 13 insertions(+), 97 deletions(-) delete mode 100755 init.d/crypto-loop delete mode 100644 xinetd.d/cvspserver diff --git a/.etckeeper b/.etckeeper index 3a46f63..700d927 100755 --- a/.etckeeper +++ b/.etckeeper @@ -362,6 +362,7 @@ maybe chmod 0755 'config-archive/etc/init.d/udev.dist' maybe chmod 0755 'config-archive/etc/init.d/urandom' maybe chmod 0755 'config-archive/etc/init.d/urandom.dist' maybe chmod 0644 'config-archive/etc/inittab' +maybe chmod 0644 'config-archive/etc/inittab.1' maybe chmod 0644 'config-archive/etc/inittab.dist' maybe chmod 0755 'config-archive/etc/layman' maybe chmod 0644 'config-archive/etc/layman/layman.cfg' @@ -743,6 +744,7 @@ maybe chmod 0644 'elinks/keybind.conf.sample' maybe chmod 0755 'env.d' maybe chmod 0644 'env.d/00basic' maybe chmod 0644 'env.d/00glibc' +maybe chmod 0644 'env.d/01cvs' maybe chmod 0644 'env.d/02locale' maybe chmod 0644 'env.d/03opengl' maybe chmod 0644 'env.d/04gcc-x86_64-pc-linux-gnu' @@ -946,7 +948,6 @@ maybe chmod 0755 'init.d/courier-imapd' maybe chmod 0755 'init.d/courier-imapd-ssl' maybe chmod 0755 'init.d/courier-pop3d' maybe chmod 0755 'init.d/courier-pop3d-ssl' -maybe chmod 0755 'init.d/crypto-loop' maybe chmod 0755 'init.d/cups-browsed' maybe chmod 0755 'init.d/cupsd' maybe chmod 0755 'init.d/dbus' @@ -1783,7 +1784,6 @@ maybe chmod 0644 'xdg/autostart/user-dirs-update-gtk.desktop' maybe chmod 0644 'xdg/user-dirs.conf' maybe chmod 0644 'xdg/user-dirs.defaults' maybe chmod 0755 'xinetd.d' -maybe chmod 0644 'xinetd.d/cvspserver' maybe chmod 0644 'xinetd.d/nrpe' maybe chmod 0644 'xinetd.d/rsyncd' maybe chmod 0644 'xinetd.d/svnserve' diff --git a/config-archive/etc/inittab b/config-archive/etc/inittab index fe9bd62..ad7317f 100644 --- a/config-archive/etc/inittab +++ b/config-archive/etc/inittab @@ -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 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 diff --git a/config-archive/etc/inittab.dist b/config-archive/etc/inittab.dist index 2f6af66..aa588b6 100644 --- a/config-archive/etc/inittab.dist +++ 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 6b23ee5..05fa423 100644 --- a/csh.env +++ b/csh.env @@ -4,6 +4,7 @@ setenv CONFIG_PROTECT '/var/bind /usr/share/gnupg/qualified.txt' 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/terminfo /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/vi' setenv GCC_SPECS '' setenv GUILE_LOAD_PATH '/usr/share/guile/1.8' diff --git a/init.d/crypto-loop b/init.d/crypto-loop deleted file mode 100755 index 853bae2..0000000 --- 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 ad7317f..ab61c63 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 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/portage/package.use b/portage/package.use index 3c4f9ba..a39b196 100644 --- a/portage/package.use +++ b/portage/package.use @@ -169,7 +169,7 @@ sys-apps/openrc tools sys-apps/pciutils network-cron -zlib sys-apps/portage epydoc sys-apps/usbutils network-cron -sys-apps/util-linux ddate loop-aes slang +sys-apps/util-linux ddate loop-aes slang tty-helpers sys-auth/pambase ssh sys-auth/pam_mysql openssl diff --git a/profile.env b/profile.env index 6ce9298..5c26a01 100644 --- a/profile.env +++ b/profile.env @@ -4,6 +4,7 @@ export CONFIG_PROTECT='/var/bind /usr/share/gnupg/qualified.txt' 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/terminfo /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/vi' export GCC_SPECS='' export GUILE_LOAD_PATH='/usr/share/guile/1.8' diff --git a/xinetd.d/cvspserver b/xinetd.d/cvspserver deleted file mode 100644 index 0f2edb0..0000000 --- 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