r4495 - dists/trunk/utils/kernel-package/kernel
Sven Luther
luther at costa.debian.org
Sun Oct 16 22:39:36 UTC 2005
Author: luther
Date: 2005-10-16 22:39:34 +0000 (Sun, 16 Oct 2005)
New Revision: 4495
Modified:
dists/trunk/utils/kernel-package/kernel/image.postinst
dists/trunk/utils/kernel-package/kernel/image.postrm
dists/trunk/utils/kernel-package/kernel/image.preinst
dists/trunk/utils/kernel-package/kernel/image.prerm
Log:
Added a better (hopefully working) version of the ramdisk fixing patch.
Modified: dists/trunk/utils/kernel-package/kernel/image.postinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postinst 2005-10-16 22:28:47 UTC (rev 4494)
+++ dists/trunk/utils/kernel-package/kernel/image.postinst 2005-10-16 22:39:34 UTC (rev 4495)
@@ -53,9 +53,8 @@
my $official_image = "=OF"; # only true for official images
my $arch = "=A"; # should be same as dpkg --print-installation-architecture
my $kernel_arch = "=B";
-my $ramdisk = '/usr/sbin/mkinitrd'; # Tool to create initial ram fs.
-chomp (my $unamedashr = `uname -r`);
-$ramdisk = '/usr/sbin/mkinitrd.yaird' if (system ("dpkg --compare-versions $unamedashr ge 2.6.13 1>/dev/null 2>&1") == 0);
+my $ramdisk = (system ("dpkg --compare-versions $version ge 2.6.13 1>/dev/null 2>&1") == 0 ?
+ '/usr/sbin/mkinitrd.yaird' : '/usr/sbin/mkinitrd'); # Tool to create initial ram fs.
my $package_name = "=ST-image-$version";
@@ -171,7 +170,7 @@
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/ig;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/ig;
$mkimage = "$1" if /mkimage\s*=\s*(.+)$/ig;
- $ramdisk = "$1" if /ramdisk\s*=\s*(\S+)/ig;
+ $ramdisk = "$1" if /ramdisk\s*=\s*(.+)/ig;
}
close CONF;
$have_conffile = "Yes";
@@ -975,15 +974,17 @@
# The initrd symlink should probably be in the same dir that the
# symlinks are in
if ($initrd) {
+ chomp (my $hostversion = `uname -r`);
my @ramdisklist =
grep {
-x and
- system ("$_ --supported-host-version=$unamedashr 1>/dev/null 2>&1") == 0
+ system ("$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1") == 0
}
(split (/ /, $ramdisk));
+ my $ramdiskorig = $ramdisk;
defined ($ramdisk = shift @ramdisklist)
- or die ("Failed to find suitable ramdisk generation tool for kernel version $version in $ramdisk\n");
+ or die ("Failed to find suitable ramdisk generation tool for kernel version $version on running kernel $hostversion in $ramdiskorig\n");
my $initrd_path = $realimageloc . "initrd.img-$version";
my $ret = system("$ramdisk " .
Modified: dists/trunk/utils/kernel-package/kernel/image.postrm
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postrm 2005-10-16 22:28:47 UTC (rev 4494)
+++ dists/trunk/utils/kernel-package/kernel/image.postrm 2005-10-16 22:39:34 UTC (rev 4495)
@@ -51,9 +51,8 @@
my $official_image = "=OF"; # only true for official images
my $arch = "=A"; # should be same as dpkg --print-installation-architecture
my $kernel_arch = "=B";
-my $ramdisk = '/usr/sbin/mkinitrd'; # Tool to create initial ram fs.
-chomp (my $unamedashr = `uname -r`);
-$ramdisk = '/usr/sbin/mkinitrd.yaird' if (system ("dpkg --compare-versions $unamedashr ge 2.6.13 1>/dev/null 2>&1") == 0);
+my $ramdisk = (system ("dpkg --compare-versions $version ge 2.6.13 1>/dev/null 2>&1") == 0 ?
+ '/usr/sbin/mkinitrd.yaird' : '/usr/sbin/mkinitrd'); # Tool to create initial ram fs.
my $Loader = "NoLOADER"; #
$Loader = "LILO" if $loader =~ /^lilo/io;
@@ -150,7 +149,7 @@
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/ig;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/ig;
$mkimage = "$1" if /mkimage\s*=\s*(.+)$/ig;
- $ramdisk = "$1" if /ramdisk\s*=\s*(\S+)/ig;
+ $ramdisk = "$1" if /ramdisk\s*=\s*(.+)/ig;
}
close CONF;
$have_conffile = "Yes";
Modified: dists/trunk/utils/kernel-package/kernel/image.preinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.preinst 2005-10-16 22:28:47 UTC (rev 4494)
+++ dists/trunk/utils/kernel-package/kernel/image.preinst 2005-10-16 22:39:34 UTC (rev 4495)
@@ -51,9 +51,8 @@
my $official_image = "=OF"; # only true for official images
my $arch = "=A"; # should be same as dpkg --print-installation-architecture
my $kernel_arch = "=B";
-my $ramdisk = '/usr/sbin/mkinitrd'; # Tool to create initial ram fs.
-chomp (my $unamedashr = `uname -r`);
-$ramdisk = '/usr/sbin/mkinitrd.yaird' if (system ("dpkg --compare-versions $unamedashr ge 2.6.13 1>/dev/null 2>&1") == 0);
+my $ramdisk = (system ("dpkg --compare-versions $version ge 2.6.13 1>/dev/null 2>&1") == 0 ?
+ '/usr/sbin/mkinitrd.yaird' : '/usr/sbin/mkinitrd'); # Tool to create initial ram fs.
@@ -160,7 +159,7 @@
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/ig;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/ig;
$mkimage = "$1" if /mkimage\s*=\s*(.+)$/ig;
- $ramdisk = "$1" if /ramdisk\s*=\s*(\S+)/ig;
+ $ramdisk = "$1" if /ramdisk\s*=\s*(.+)/ig;
}
close CONF;
$have_conffile = "Yes";
@@ -185,23 +184,24 @@
$initrd=~ s/^$pattern$//;
if ($initrd) {
+ chomp (my $hostversion = `uname -r`);
my @ramdisklist =
grep {
-x and
- system ("$_ --supported-host-version=$unamedashr 1>/dev/null 2>&1") == 0
+ system ("$_ --supported-host-version=$hostversion --supported-target-version=$version 1>/dev/null 2>&1") == 0
}
(split (/ /, $ramdisk));
- my $msgramdisk = $ramdisk;
+ my $ramdiskorig = $ramdisk;
$ramdisk = shift @ramdisklist;
if (! -e $ramdisk) {
print STDERR <<EOERROR;
You are attempting to install an initrd kernel image (version
-$version) while running a kernel of version $unamedashr, but
+$version) while running a kernel of version $hostversion, but
you have no suitable ramdisk generation tool installed among
-$msgramdisk. This will break the installation, unless a
+$ramdiskorig. This will break the installation, unless a
suitable ramdisk generation tool is also being installed right
now.
Modified: dists/trunk/utils/kernel-package/kernel/image.prerm
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.prerm 2005-10-16 22:28:47 UTC (rev 4494)
+++ dists/trunk/utils/kernel-package/kernel/image.prerm 2005-10-16 22:39:34 UTC (rev 4495)
@@ -47,9 +47,8 @@
my $official_image = "=OF"; # only true for official images
my $arch = "=A"; # should be same as dpkg --print-installation-architecture
my $kernel_arch = "=B";
-my $ramdisk = '/usr/sbin/mkinitrd'; # Tool to create initial ram fs.
-chomp (my $unamedashr = `uname -r`);
-$ramdisk = '/usr/sbin/mkinitrd.yaird' if (system ("dpkg --compare-versions $unamedashr ge 2.6.13 1>/dev/null 2>&1") == 0);
+my $ramdisk = (system ("dpkg --compare-versions $version ge 2.6.13 1>/dev/null 2>&1") == 0 ?
+ '/usr/sbin/mkinitrd.yaird' : '/usr/sbin/mkinitrd'); # Tool to create initial ram fs.
my $Loader = "NoLOADER"; #
$Loader = "LILO" if $loader =~ /^lilo/io;
@@ -165,7 +164,7 @@
$preinst_hook = "$1" if /preinst_hook\s*=\s*(\S+)/ig;
$prerm_hook = "$1" if /prerm_hook\s*=\s*(\S+)/ig;
$mkimage = "$1" if /mkimage\s*=\s*(.+)$/ig;
- $ramdisk = "$1" if /ramdisk\s*=\s*(\S+)/ig;
+ $ramdisk = "$1" if /ramdisk\s*=\s*(.+)/ig;
}
close CONF;
$have_conffile = "Yes";
More information about the Kernel-svn-changes
mailing list