Avoid hard coded perl version in list files, use PERL_VERSION magic

string instead.

3 files changed, 11 insertions, 11 deletions

diff --git a/rescue/list b/rescue/list
index b9d598469..eea7dd1b9 100644
--- a/rescue/list
+++ b/rescue/list
@@ -116,7 +116,7 @@
 /sbin/killall5
 /usr/bin/perl
 /usr/bin/perl5
-/usr/bin/perl5.6.1
+/usr/bin/perlPERL_VERSION
 /bin/sort
 /usr/bin/md5sum
 /etc/protocols
@@ -125,12 +125,12 @@
 /sbin/mkraid
 /usr/lib/rpm/rpmrc
 /usr/lib/rpm/macros
-/usr/lib/perl5/5.6.1/strict.pm
-/usr/lib/perl5/5.6.1/vars.pm
-/usr/lib/perl5/5.6.1/warnings/register.pm
-/usr/lib/perl5/5.6.1/warnings.pm
-/usr/lib/perl5/5.6.1/Carp.pm
-/usr/lib/perl5/5.6.1/Exporter.pm
+/usr/lib/perl5/PERL_VERSION/strict.pm
+/usr/lib/perl5/PERL_VERSION/vars.pm
+/usr/lib/perl5/PERL_VERSION/warnings/register.pm
+/usr/lib/perl5/PERL_VERSION/warnings.pm
+/usr/lib/perl5/PERL_VERSION/Carp.pm
+/usr/lib/perl5/PERL_VERSION/Exporter.pm
 /usr/bin/lspci
 /usr/share/pci.ids
 /usr/bin/lspcidrake
diff --git a/rescue/list.i386 b/rescue/list.i386
index 12dda5cd6..818bf92be 100644
--- a/rescue/list.i386
+++ b/rescue/list.i386
@@ -6,5 +6,5 @@
 /sbin/reiserfsck
 /sbin/sfdisk
 /boot/grub/stage[12]
-/usr/lib/perl5/5.6.1/i386-linux/CORE/libperl.so
-/usr/lib/perl5/site_perl/5.6.1/i386-linux/packdrake.pm
+/usr/lib/perl5/PERL_VERSION/i386-linux/CORE/libperl.so
+/usr/lib/perl5/site_perl/PERL_VERSION/i386-linux/packdrake.pm
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 44766f318..df4cbca15 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -54,8 +54,8 @@ foreach (keyboard::loadkeys_files) {
 }
 unlink "$tmp/usr/lib/kbd/keymaps/i386/qwertz/fr.kmap.gz";
 
-
-@files = map { chomp; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
+my $perl_version = join ".", unpack "C3", $^V;
+@files = map { chomp; s/PERL_VERSION/$perl_version/g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
 `ls @files`; 
 $? == 0 or exit 1;