summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2006-03-06 10:40:54 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2006-03-06 10:40:54 +0000
commit5b8c144de66be53598c115eafbab712d50b43c0c (patch)
treedf3966bf09e63d67aacc98ba43afd3332c01bb48
parent2f09db467155536e54199b7beffa395c8fd14ec1 (diff)
downloaddrakx-5b8c144de66be53598c115eafbab712d50b43c0c.tar
drakx-5b8c144de66be53598c115eafbab712d50b43c0c.tar.gz
drakx-5b8c144de66be53598c115eafbab712d50b43c0c.tar.bz2
drakx-5b8c144de66be53598c115eafbab712d50b43c0c.tar.xz
drakx-5b8c144de66be53598c115eafbab712d50b43c0c.zip
- Fixed Plug'n'Print: Name of user logged in on the desktop is in
/var/run/console/console.lock now.
-rwxr-xr-xperl-install/standalone/autosetupprintqueues4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/standalone/autosetupprintqueues b/perl-install/standalone/autosetupprintqueues
index 660032b15..2f9af40a2 100755
--- a/perl-install/standalone/autosetupprintqueues
+++ b/perl-install/standalone/autosetupprintqueues
@@ -34,7 +34,9 @@ $gui = "nogui" if (! -x "/usr/X11R6/bin/X");
if ($gui ne "nogui") {
# Auto-detect whether we go in non-X mode or not
- my $desktopuser = `cat /var/run/console.lock 2>/dev/null`;
+ my $desktopuser;
+ $desktopuser = `cat /var/run/console.lock 2>/dev/null` or
+ $desktopuser = `cat /var/run/console/console.lock 2>/dev/null`;
if (!$desktopuser) {
if ($gui eq "auto") {
# Non-X mode