From 22c52ba5163d190cbeb32627ab15328210f60624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Thu, 13 Nov 2003 07:33:20 +0000
Subject: exclude "cdcom" kernels from /export & isolinux

---
 Makefile      | 1 +
 make_boot_img | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0d2240bc5..295b15381 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ install_only:
 	make -C tools/$(ARCH)/cd install ROOTDEST=$(ROOTDEST)
     endif
 	cd $(ROOTDEST)/images; rm -rf alternatives 
+	rm -f $(ROOTDEST)/images/*.img-cdcom*
 	if [ `ls $(ROOTDEST)/images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then	\
 	  cd $(ROOTDEST)/images; mkdir alternatives; cd alternatives; mv ../*.img-* .; md5sum *.img-* > MD5SUM; \
 	fi
diff --git a/make_boot_img b/make_boot_img
index 820f69c81..f56baaba8 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -622,7 +622,7 @@ rescue-net:             boots the rescue image from a network server
 
 sub isolinux {
     my ($main, @kernels) = @_;
-    @kernels = ($main, grep { $_ ne $main } @kernels);
+    @kernels = ($main, grep { $_ ne $main && $_ !~ /cdcom/ } @kernels);
     _ "rm -rf isolinux"; mkdir "isolinux", 0777;
     my $i = 0;
     foreach (@kernels) {
-- 
cgit v1.2.1