summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2001-07-27 16:51:16 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2001-07-27 16:51:16 +0000
commitb0735c28791124d49878f33406538cd0e2a9be5c (patch)
tree215d76993e3be16aad1481eb609fe119e76784bd /perl-install/standalone
parent9e59aa5ab94b40986be1f3a3bd74b8056c7b48cb (diff)
downloaddrakx-b0735c28791124d49878f33406538cd0e2a9be5c.tar
drakx-b0735c28791124d49878f33406538cd0e2a9be5c.tar.gz
drakx-b0735c28791124d49878f33406538cd0e2a9be5c.tar.bz2
drakx-b0735c28791124d49878f33406538cd0e2a9be5c.tar.xz
drakx-b0735c28791124d49878f33406538cd0e2a9be5c.zip
Printerdrake changed to use Foomatic, driver options, spooler change
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/printerdrake20
1 files changed, 15 insertions, 5 deletions
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index c6f9d90a6..5f9277f12 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -38,12 +38,22 @@ $::noauto = /-noauto/;
$::skiptest = /-skiptest/;
$::testing = /-testing/;
-my $printer; eval { $printer = printer::getinfo('') };
-/-lpr/ and $printer->{mode} = 'lpr';
-/-cups/ and $printer->{mode} = 'CUPS';
-$printer->{mode} ||= 'CUPS'; #- assume this default if nothing found.
+my $printer;
+# Get what was installed before
+eval { $printer = printer::getinfo('') };
+# Choose the spooler by command line options
+/-cups/ and
+ $printer->{mode} = 'cups' and printer::read_configured_queues($printer);
+/-lpr/ and
+ $printer->{mode} = 'lpd' and printer::read_configured_queues($printer);
+/-lpd/ and
+ $printer->{mode} = 'lpd' and printer::read_configured_queues($printer);
+/-lprng/ and
+ $printer->{mode} = 'lprng' and printer::read_configured_queues($printer);
+/-pdq/ and
+ $printer->{mode} = 'pdq' and printer::read_configured_queues($printer);
-my $in = vnew interactive('su', 'printer');
+my $in = vnew interactive('printer', 'su');
-r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');