summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-11-13 07:33:20 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-11-13 07:33:20 +0000
commit22c52ba5163d190cbeb32627ab15328210f60624 (patch)
tree024eed04b2ab1efe7a3b6d94fe6a7de8a5e64cdf
parent1e5733a673d74eed07e3c5afceec3c879443b9fb (diff)
downloaddrakx-22c52ba5163d190cbeb32627ab15328210f60624.tar
drakx-22c52ba5163d190cbeb32627ab15328210f60624.tar.gz
drakx-22c52ba5163d190cbeb32627ab15328210f60624.tar.bz2
drakx-22c52ba5163d190cbeb32627ab15328210f60624.tar.xz
drakx-22c52ba5163d190cbeb32627ab15328210f60624.zip
exclude "cdcom" kernels from /export & isolinux
-rw-r--r--Makefile1
-rwxr-xr-xmake_boot_img2
2 files changed, 2 insertions, 1 deletions
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) {