summaryrefslogtreecommitdiffstats
path: root/perl-install/printer
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-03-16 14:48:11 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-03-16 14:48:11 +0000
commit6ba62a43f04b784cfb0d6dba04b67cb4be878f41 (patch)
tree4147820216b8b6b7742a386e595e5bec7df35f39 /perl-install/printer
parentb4e4f9467faefaaec68d0272f6fa776985810473 (diff)
downloaddrakx-backup-do-not-use-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar
drakx-backup-do-not-use-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.gz
drakx-backup-do-not-use-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.bz2
drakx-backup-do-not-use-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.tar.xz
drakx-backup-do-not-use-6ba62a43f04b784cfb0d6dba04b67cb4be878f41.zip
- Fixed setting of default printer on daemon-less CUPS client (bug #13940).
Diffstat (limited to 'perl-install/printer')
-rw-r--r--perl-install/printer/default.pm12
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;
}
d class='commitgraph'>* Add vera font by defaultFrederic Crozat2003-07-291-1/+1 | * updated pot filePablo Saratxaga2003-07-292-90/+67 | * moved mkfs.xfsFrancois Pons2003-07-281-1/+1 | * updated pot filePablo Saratxaga2003-07-252-787/+757 | * removed ncompress (contrib)Frederic Lepied2003-07-241-1/+1 | * Added Uzbek cyrillic filePablo Saratxaga2003-07-231-0/+18251 | * updated pot filePablo Saratxaga2003-07-211-51/+117 | * updated pot filePablo Saratxaga2003-07-141-138/+418 | * changed "Country" . " / Region" to "Country / Region" and fixed Chinese po'sPablo Saratxaga2003-07-121-12/+7 | * updated pot filePablo Saratxaga2003-07-101-95/+129 | * updated pot filePablo Saratxaga2003-07-092-10998/+11474 | * install netprofile on laptopsFrederic Lepied2003-07-081-0/+1 | * iAdded various new keyboard layoutsPablo Saratxaga2003-07-011-0/+0 | * Moved Bokmaal file to nb.poPablo Saratxaga2003-06-281-21449/+0 | * Fixed typos; updated Ukrainian po filePablo Saratxaga2003-06-272-33/+33 | * updated pot filePablo Saratxaga2003-06-272-498/+721 | * use the mkswap commandPascal Rigaux2003-06-181-0/+1 | | | | | | | => simpler code and mkswap is not big => rely on mkswap for choosing the swap version (note that kernel 2.5 doesn't handle v0 swap anymore) * updated pot filePablo Saratxaga2003-06-162-458/+572 | * change a bit how strings are passed to advertising systemGuillaume Cottenceau2003-06-1216-1252/+1632 | | | | | | so that we don't specify absolute x,y positions for each paragraph, ending with overwritten text in some localizations * cookerGuillaume Cottenceau2003-06-061-0/+0 | * updated Estonien, Japanese, Albanian and Vietnamese po filesPablo Saratxaga2003-06-033-3301/+3539 | * UpdateArkadiusz Lipiec2003-06-021-195/+308 | * updated Spanish translationsFabián Mandelbaum2003-06-021-154/+271 | * changed the name of the russian phonetic layoutPablo Saratxaga2003-05-3147-6454/+11245 | * updated Vietnamese filePablo Saratxaga2003-05-302-67/+68 | * updated Albanian filePablo Saratxaga2003-05-281-5/+46 | * updated pot filePablo Saratxaga2003-05-261-3/+43 | * updated pot filePablo Saratxaga2003-05-222-75/+134 | * updated pot filePablo Saratxaga2003-05-202-98/+147 | * updated German, Estonian and Finnish filesPablo Saratxaga2003-05-203-1420/+1964 | * update french translationThierry Vignaud2003-05-201-67/+54 | * updated Spanish translationsFabián Mandelbaum2003-05-191-221/+176 | * updated pot filePablo Saratxaga2003-05-16