diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2005-12-16 16:38:27 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2005-12-16 16:38:27 +0000 |
| commit | c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f (patch) | |
| tree | 1d7a0f271c0434bd057e30da57ecd91c6093b13c | |
| parent | 3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b (diff) | |
| download | drakx-backup-do-not-use-c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f.tar drakx-backup-do-not-use-c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f.tar.gz drakx-backup-do-not-use-c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f.tar.bz2 drakx-backup-do-not-use-c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f.tar.xz drakx-backup-do-not-use-c5a36112bb49edf197e1b26fb0cfc1fdef2a2b3f.zip | |
- Removed "localhost" from the DISPLAY veriable, it broke the
authorization to pop up the printerdrake window on the user's
desktop when a new USB printer was plugged.
| -rwxr-xr-x | perl-install/standalone/autosetupprintqueues | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/autosetupprintqueues b/perl-install/standalone/autosetupprintqueues index 2fba78bac..660032b15 100755 --- a/perl-install/standalone/autosetupprintqueues +++ b/perl-install/standalone/autosetupprintqueues @@ -65,9 +65,9 @@ if ($gui ne "nogui") { chomp $userhome; my $errfile = "/dev/null"; if (-r "$userhome/.Xauthority") { - system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; export XAUTHORITY=$userhome/.Xauthority; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1;"; + system "export DISPLAY=\":0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; export XAUTHORITY=$userhome/.Xauthority; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1;"; } else { - system "export DISPLAY=\"localhost:0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost +localhost >> $errfile 2>&1\"; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost -localhost >> $errfile 2>&1\""; + system "export DISPLAY=\":0.0\"; export USER=$desktopuser; [ -r /etc/sysconfig/i18n ] >> $errfile 2>&1 && for l in `cat /etc/sysconfig/i18n`; do export \$l; done >> $errfile 2>&1; [ -r $userhome/.i18n ] >> $errfile 2>&1 && for l in `cat $userhome/.i18n`; do export \$l; done >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost +localhost >> $errfile 2>&1\"; /usr/sbin/printerdrake --onlyautoqueue >> $errfile 2>&1; /bin/su $desktopuser -c \"/usr/X11R6/bin/xhost -localhost >> $errfile 2>&1\""; } exit 0; } |