diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2005-03-16 14:48:11 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2005-03-16 14:48:11 +0000 |
| commit | 6ba62a43f04b784cfb0d6dba04b67cb4be878f41 (patch) | |
| tree | 4147820216b8b6b7742a386e595e5bec7df35f39 | |
| parent | b4e4f9467faefaaec68d0272f6fa776985810473 (diff) | |
| download | drakx-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar drakx-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.gz drakx-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.bz2 drakx-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.xz drakx-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.zip | |
- Fixed setting of default printer on daemon-less CUPS client (bug #13940).
| -rw-r--r-- | perl-install/printer/default.pm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm index a6e64c30d..41da25c56 100644 --- a/perl-install/printer/default.pm +++ b/perl-install/printer/default.pm @@ -12,10 +12,14 @@ my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler"; sub set_printer { my ($printer) = $_[0]; my $spooler = $printer->{SPOOLER}; - $spooler = "cups" if $spooler eq "rcups"; - run_program::rooted($::prefix, "foomatic-configure", - "-D", "-q", "-s", $spooler, - "-n", $printer->{DEFAULT}) or return 0; + if ($spooler eq "rcups") { + run_program::rooted($::prefix, "lpoptions", + "-d", $printer->{DEFAULT}) or return 0; + } else { + run_program::rooted($::prefix, "foomatic-configure", + "-D", "-q", "-s", $spooler, + "-n", $printer->{DEFAULT}) or return 0; + } return 1; } |