projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tag 0.7.26 for changeset abafae464699637bcdb1b7a074849ecb1b5290de
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
9315172
..
f7d2af3
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-4,7
+4,7
@@
# Authors: grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change:
Don Sep 20 15:31:56
CEST 2007 [mika]
+# Latest change:
Son Sep 30 14:15:11
CEST 2007 [mika]
################################################################################
# {{{ path, variables, signals, umask, zsh
################################################################################
# {{{ path, variables, signals, umask, zsh
@@
-270,12
+270,8
@@
config_language(){
# activate unicode console if running within utf8 environment
if [ -r /etc/default/locale ] ; then
if grep -q "LANG=.*UTF" /etc/default/locale ; then
# activate unicode console if running within utf8 environment
if [ -r /etc/default/locale ] ; then
if grep -q "LANG=.*UTF" /etc/default/locale ; then
- if checkgrmlsmall && [ -z "$INSTALLED" ] ; then
- ewarn "Not runnning unicode_start: grml-small with reduced language support detected." ; eend 0
- else
- einfo "Setting up unicode environment."
- unicode_start 2>>$DEBUG ; eend $?
- fi
+ einfo "Setting up unicode environment."
+ unicode_start 2>>$DEBUG ; eend $?
fi
fi
fi
fi
@@
-748,7
+744,7
@@
if [ -d /proc/acpi ]; then
else
ewarn "(none)" ; eend 1
fi
else
ewarn "(none)" ; eend 1
fi
- if !
[ -S /var/run/acpid.socket ]
; then
+ if !
ps x | grep -q /usr/sbin/acpid
; then
if ! [ -r /var/run/dbus/pid ] ; then
einfo "Starting acpi daemon."
/etc/init.d/acpid start 1>>$DEBUG 2>&1 ; eend $?
if ! [ -r /var/run/dbus/pid ] ; then
einfo "Starting acpi daemon."
/etc/init.d/acpid start 1>>$DEBUG 2>&1 ; eend $?