r4599 - dists/trunk/utils/kernel-package/kernel

[Sven Luther]

Author: luther
Date: 2005-10-23 06:59:41 +0000 (Sun, 23 Oct 2005)
New Revision: 4599

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:
Let's use a default of : mkinitrd, mkinitrd.yaird, mkinitramfs.
This will use the later logic to do the right thing, and is much 
better than my previous version checking solution.


Modified: dists/trunk/utils/kernel-package/kernel/image.postinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postinst	2005-10-23 05:15:41 UTC (rev 4598)
+++ dists/trunk/utils/kernel-package/kernel/image.postinst	2005-10-23 06:59:41 UTC (rev 4599)
@@ -53,8 +53,7 @@
 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           = (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 $ramdisk           = "/usr/sbin/mkinitrd /usr/sbin/mkinitrd.yaird /usr/sbin/mkinitramfs"
 
 
 my $package_name    = "=ST-image-$version";

Modified: dists/trunk/utils/kernel-package/kernel/image.postrm
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.postrm	2005-10-23 05:15:41 UTC (rev 4598)
+++ dists/trunk/utils/kernel-package/kernel/image.postrm	2005-10-23 06:59:41 UTC (rev 4599)
@@ -51,9 +51,9 @@
 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           = (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 $ramdisk           = "/usr/sbin/mkinitrd /usr/sbin/mkinitrd.yaird /usr/sbin/mkinitramfs"
 
+
 my $Loader          = "NoLOADER"; # 
 $Loader             = "LILO"     if $loader =~ /^lilo/io;
 $Loader             = "SILO"     if $loader =~ /^silo/io;

Modified: dists/trunk/utils/kernel-package/kernel/image.preinst
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.preinst	2005-10-23 05:15:41 UTC (rev 4598)
+++ dists/trunk/utils/kernel-package/kernel/image.preinst	2005-10-23 06:59:41 UTC (rev 4599)
@@ -51,8 +51,7 @@
 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           = (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 $ramdisk	      = "/usr/sbin/mkinitrd /usr/sbin/mkinitrd.yaird /usr/sbin/mkinitramfs"
 
 
 

Modified: dists/trunk/utils/kernel-package/kernel/image.prerm
===================================================================
--- dists/trunk/utils/kernel-package/kernel/image.prerm	2005-10-23 05:15:41 UTC (rev 4598)
+++ dists/trunk/utils/kernel-package/kernel/image.prerm	2005-10-23 06:59:41 UTC (rev 4599)
@@ -47,9 +47,9 @@
 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           = (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 $ramdisk           = "/usr/sbin/mkinitrd /usr/sbin/mkinitrd.yaird /usr/sbin/mkinitramfs"
 
+
 my $Loader          = "NoLOADER"; # 
 $Loader             = "LILO"     if $loader =~ /^lilo/io;
 $Loader             = "SILO"     if $loader =~ /^silo/io;