aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-01-20 22:00:04 +0000
committerBill Nottingham <notting@redhat.com>2006-01-20 22:00:04 +0000
commit359814426ecf73211221d87a9a1ecafff10545c9 (patch)
tree3c27c86fb12eda447135ab6cd5fb1ea700a581e4
parentcbf94e7107655151dc138e3e22e05afe3234d959 (diff)
downloadinitscripts-359814426ecf73211221d87a9a1ecafff10545c9.tar
initscripts-359814426ecf73211221d87a9a1ecafff10545c9.tar.gz
initscripts-359814426ecf73211221d87a9a1ecafff10545c9.tar.bz2
initscripts-359814426ecf73211221d87a9a1ecafff10545c9.tar.xz
initscripts-359814426ecf73211221d87a9a1ecafff10545c9.zip
get rid of some path lookups (#178321, <mclasen@redhat.com>)
-rw-r--r--initscripts.spec1
-rwxr-xr-xlang.sh4
-rwxr-xr-xprefdm6
3 files changed, 6 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec
index ca590507..4c318678 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -22,6 +22,7 @@ Conflicts: mkinitrd < 4.0, kernel < 2.6.12
Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
Conflicts: dhclient < 3.0.3-7
Conflicts: tcsh < 6.13-5
+Conflicts: xorg-x11
#Conflicts: diskdumputils < 1.1.0
Obsoletes: rhsound sapinit
Obsoletes: hotplug
diff --git a/lang.sh b/lang.sh
index 2bf16f35..50c7c000 100755
--- a/lang.sh
+++ b/lang.sh
@@ -61,8 +61,8 @@ if [ "$sourced" = 1 ]; then
if [ -n "$LANG" ]; then
case $LANG in
*.utf8*|*.UTF-8*)
- if [ "$TERM" = "linux" -a "`/sbin/consoletype`" = "vt" -a $SHLVL -eq 1 ]; then
- [ -x /bin/unicode_start ] && /sbin/consoletype fg && unicode_start $SYSFONT $SYSFONTACM
+ if [ "$TERM" = "linux" -a "`/sbin/consoletype`" = "vt" ]; then
+ [ -x /bin/unicode_start ] && /sbin/consoletype fg && /bin/unicode_start $SYSFONT $SYSFONTACM
fi
;;
esac
diff --git a/prefdm b/prefdm
index 2b5584ed..e62ff0bd 100755
--- a/prefdm
+++ b/prefdm
@@ -15,11 +15,11 @@ preferred=
if [ -f /etc/sysconfig/desktop ]; then
. /etc/sysconfig/desktop
if [ "$DISPLAYMANAGER" = GNOME ]; then
- preferred=gdm
+ preferred=/usr/sbin/gdm
elif [ "$DISPLAYMANAGER" = KDE ]; then
- preferred=kdm
+ preferred=/usr/bin/kdm
elif [ "$DISPLAYMANAGER" = XDM ]; then
- preferred=xdm
+ preferred=/usr/bin/xdm
elif [ -n "$DISPLAYMANAGER" ]; then
preferred=$DISPLAYMANAGER
fi