From b50bd8b363deeb7529c1d61aad34524bb1361ff8 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 24 Jan 2012 10:12:51 +0100 Subject: [PATCH] Current state --- bash/bashrc | 4 +--- cups/printers.conf | 2 +- cups/printers.conf.O | 2 +- motd | 9 +++------ rc.conf | 4 ++-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/bash/bashrc b/bash/bashrc index d1281e35..3ac0859a 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -139,8 +139,7 @@ if [ -f /usr/share/mc/mc.gentoo ]; then . /usr/share/mc/mc.gentoo fi -if [ -f /etc/profile.d/bash-completion ]; then - . /etc/profile.d/bash-completion +if [ -e /etc/bash_completion.d/git ] ; then if [[ ${EUID} == 0 ]] ; then PS1='$? \[\033[01;31m\]\h\[\033[01;30m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(__git_ps1)\[\033[01;34m\] \$ \[\033[00m\]' else @@ -148,5 +147,4 @@ if [ -f /etc/profile.d/bash-completion ]; then fi fi - # vim: ts=4 expandtab diff --git a/cups/printers.conf b/cups/printers.conf index f64ce7dd..5b1869a5 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-22 14:02 +# Written by cupsd on 2012-01-24 08:12 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 4696170f..e5442f13 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.4.8 -# Written by cupsd on 2012-01-22 13:32 +# Written by cupsd on 2012-01-23 06:47 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING Info Kyocera FS-1020D diff --git a/motd b/motd index e17c46e2..2b5a3c15 100644 --- a/motd +++ b/motd @@ -7,11 +7,8 @@ Gentoo Base System release 2.0.3 |____/|_| \__,_|_| |_|_| -Sicherlich würde das menschliche Leben weit glücklicher verlaufen, -wenn der Mensch ebenso gut zu schweigen wie zu reden vermöchte. Aber -die Erfahrung lehrt uns mehr als genug, daß der Mensch nichts so -schwer beherrscht wie seine Zunge. - -- Baruch de Spinoza +Wenn ich wüßte, was Kunst ist, würde ich es für mich behalten. + -- Pablo Picasso -Today is Boomtime, the 22nd day of Chaos in the YOLD 3178 +Today is Prickle-Prickle, the 24th day of Chaos in the YOLD 3178 diff --git a/rc.conf b/rc.conf index 9a85e8e8..2e5c1c41 100644 --- a/rc.conf +++ b/rc.conf @@ -47,11 +47,11 @@ rc_shell=/sbin/sulogin # /var/log/rc.log # NOTE: Linux systems require the devfs service to be started before # logging can take place and as such cannot log the sysinit runlevel. -#rc_logger="YES" +rc_logger="YES" # Through rc_log_path you can specify a custom log file. # The default value is: /var/log/rc.log -#rc_log_path="/var/log/rc.log" +rc_log_path="/var/log/rc.log" # By default we filter the environment for our running scripts. To allow other # variables through, add them here. Use a * to allow all variables through. -- 2.39.5