summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-09-14 17:42:04 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-09-14 17:42:04 +0000
commitdd1f2590c490e72e71d1545d41be27567ff37775 (patch)
treef3b571e99ece9fdf1d7b3010973707fc6e44c36d
parentd914b67de1a95f7ed59f4d78584d9e46cfff04cc (diff)
downloaddrakx-backup-do-not-use-dd1f2590c490e72e71d1545d41be27567ff37775.tar
drakx-backup-do-not-use-dd1f2590c490e72e71d1545d41be27567ff37775.tar.gz
drakx-backup-do-not-use-dd1f2590c490e72e71d1545d41be27567ff37775.tar.bz2
drakx-backup-do-not-use-dd1f2590c490e72e71d1545d41be27567ff37775.tar.xz
drakx-backup-do-not-use-dd1f2590c490e72e71d1545d41be27567ff37775.zip
Made "LPRng" show up in the spooler menu when LPRng is installed.
-rw-r--r--perl-install/printer.pm15
1 files changed, 10 insertions, 5 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 80a1073c8..9f3031720 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -67,13 +67,18 @@ sub default_printer_type($) { "LOCAL" }
sub spooler {
# LPD is taken from the menu for the moment because the classic LPD is
# highly unsecure. Depending on how the GNU lpr development is going on
- # LPD support can be reactivated by uncommenting the line which is
- # commented out now.
-
- # LPRng is taken out of the distro since Mandrake 9.0.
+ # LPD support can be reactivated by uncommenting the following line.
#return @spooler_inv{qw(cups lpd lprng pdq)};
- return @spooler_inv{qw(cups pdq)};
+
+ # LPRng is not officially supported any more since Mandrake 9.0, so
+ # show it only in the spooler menu when it was manually installed.
+ if (files_exist((qw(/usr/lib/filters/lpf
+ /usr/sbin/lpd)))) {
+ return @spooler_inv{qw(cups lprng pdq)};
+ } else {
+ return @spooler_inv{qw(cups pdq)};
+ }
}
sub printer_type($) {