From 23ebeb6af4ece1c8d97120a327976cef695f2836 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 15 Jan 2005 18:00:42 +0000
Subject: add a VERSION file in boot.iso to allow its identification (as
 suggested on cooker)

---
 Makefile      |  2 +-
 make_boot_img | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 600662505..33fea72f0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ dirs:
 	@for n in $(DIRS); do $(MAKE) -C $$n all || exit 1 ; done
 
 images:
-	./make_boot_img
+	DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_boot_img boot.iso
 
 tar: clean
 	rpm -qa > needed_rpms.lst
diff --git a/make_boot_img b/make_boot_img
index 274dd9e91..f41de9154 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -72,9 +72,9 @@ foreach my $img (@images) {
 	    system("/bin/cp -f move/isolinux/* $tftpboot/move 2>/dev/null");
 	}
     } elsif ($img =~ /boot.iso/) {
-	boot_iso($img, 0);
+	boot_iso($img, 0, \@kernels);
     } elsif ($img =~ /bootcdrom.iso/) {
-	boot_iso($img, 1);
+	boot_iso($img, 1, \@kernels);
     } elsif ($img =~ /drivers/) {
 	drivers($type, $I, "$img-$_") foreach @kernels_BOOT;
 	rename("$img-$main_BOOT", $img);
@@ -787,7 +787,7 @@ EOF
 }
 
 sub boot_iso {
-    my ($iso, $bootcdrom) = @_;
+    my ($iso, $bootcdrom, $kernels) = @_;
 
     my $cfg = cat_('isolinux/isolinux.cfg') or die 'isolinux missing';
     if ($bootcdrom) {
@@ -799,6 +799,11 @@ sub boot_iso {
     eval { rm_rf('.boot_iso') };
     mkdir_p('.boot_iso/isolinux');
     _ "cd .boot_iso/isolinux ; ln -s ../../isolinux/* .";
+
+    output('.boot_iso/VERSION', map { "$_\n" }
+	   $ENV{DISTRIB_DESCR},
+	   scalar gmtime(),
+	   '', @$kernels);	   
    
     my $cfg_file = '.boot_iso/isolinux/isolinux.cfg';
     unlink $cfg_file;
-- 
cgit v1.2.1