diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-01-15 18:00:42 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-01-15 18:00:42 +0000 |
commit | 23ebeb6af4ece1c8d97120a327976cef695f2836 (patch) | |
tree | cf58197608a685230fc90158cb669fc7cf9cef8a | |
parent | f7538fea10162f7fd77e1d75fdc16dff08a39466 (diff) | |
download | drakx-23ebeb6af4ece1c8d97120a327976cef695f2836.tar drakx-23ebeb6af4ece1c8d97120a327976cef695f2836.tar.gz drakx-23ebeb6af4ece1c8d97120a327976cef695f2836.tar.bz2 drakx-23ebeb6af4ece1c8d97120a327976cef695f2836.tar.xz drakx-23ebeb6af4ece1c8d97120a327976cef695f2836.zip |
add a VERSION file in boot.iso to allow its identification (as suggested on cooker)
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | make_boot_img | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -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; |