summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-02-26 03:10:16 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-02-26 03:10:16 +0000
commit2d4f2558a272e1bc39d990b8afe152cf9bcf1130 (patch)
treeb0c177486a1627203246ee1da3f18c27000460d9 /perl-install
parent8990d03b8f54f5656c0b18e55f1090991be1970f (diff)
downloaddrakx-2d4f2558a272e1bc39d990b8afe152cf9bcf1130.tar
drakx-2d4f2558a272e1bc39d990b8afe152cf9bcf1130.tar.gz
drakx-2d4f2558a272e1bc39d990b8afe152cf9bcf1130.tar.bz2
drakx-2d4f2558a272e1bc39d990b8afe152cf9bcf1130.tar.xz
drakx-2d4f2558a272e1bc39d990b8afe152cf9bcf1130.zip
Fixes for HPOJ setup during installation.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer/data.pm1
-rw-r--r--perl-install/printer/main.pm9
2 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index c5d1a385a..4a64ead75 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -11,6 +11,7 @@ use vars qw(@ISA @EXPORT);
our $kernelversion = `uname -r 2>/dev/null`;
$kernelversion =~ s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
+chomp $kernelversion;
our $usbprintermodule = ($kernelversion eq '2.6' ? "usblp" : "printer");
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index fa42e4b54..2d49a7d00 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2147,6 +2147,15 @@ sub configure_hpoj {
s!etcPtal="/etc/ptal"!etcPtal="$::prefix/etc/ptal"!g;
s!varLock="/var/lock"!varLock="$::prefix/var/lock"!g;
s!varRunPrefix="/var/run"!varRunPrefix="$::prefix/var/run"!g;
+ s!/sbin/lsmod!/usr/bin/lsmod!g;
+ s!/sbin/modprobe!/usr/bin/modprobe!g;
+ s!/sbin/rmmod!/usr/bin/rmmod!g;
+ s!(my\s*\$osPlatform\s*=\s*).*?$!$1"Linux";!g;
+ s!chomp\s*\$osPlatform\s*;\s*$!!g;
+ s!(my\s*\$linuxVersion\s*=\s*).*?$!$1"$kernelversion";!g;
+ s!^\s*\$linuxVersion\s*=~\s*s.*$!!g;
+ s!chomp\s*\$linuxVersion\s*;\s*$!!g;
+ s!(my\s*\$usbprintermodule\s*=\s*).*?$!$1"$usbprintermodule";!g;
}
push @ptalinitfunctions, $_;
}