- update_kernel: now require install rpms or rpm files as arguments

  (this allow specifying precisely which installed kernels are used)

nb:
- RPMS/ is not used anymore, pkgs given an command line are installed directly in all.kernels/
- RPMS/.main is replaced by all.kernels/.list which keeps the ordering of kernels given to update_kernel

1 files changed, 2 insertions, 4 deletions

diff --git a/images/make_boot_img b/images/make_boot_img
index ed56e0ec3..e08e50ef5 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -32,9 +32,7 @@ sub mke2fs {
 _ "mkdir -p $tmp_mnt";
 mkdir "images";
 
-my @kernels = all('all.kernels');
-my $main = chomp_(cat_('RPMS/.main')) || $kernels[0];
-@kernels = uniq($main, @kernels);
+my @kernels = chomp_(cat_('all.kernels/.list'));
 
 my @all_images = (
 		  if_($arch =~ /i.86/, 'isolinux', 'boot.iso', 'all.img', 'hd_grub.img'),
@@ -63,7 +61,7 @@ foreach my $img (@images) {
     } elsif ($extension eq 'img') {
 	print STDERR "calling boot_img_$arch for $img\n";
 	$::{"boot_img_$arch"}->($type, $I, "$img-$_", "all.kernels/$_/vmlinuz") foreach @kernels;
-	rename("$img-$main", $img);
+	rename("$img-$kernels[0]", $img);
     } else {
 	die "unknown image $img";
     }