summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-01-20 11:19:16 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-01-20 11:19:16 +0000
commit8fe14f4569b0d7a3511e62254fcf5a11148b8259 (patch)
treeb88d677b026c78ff118d58993f0c4c43f9faa305
parentf2afb878f29cb7e38d3ec5ad368cea9d2c3684d3 (diff)
downloaddrakx-backup-do-not-use-8fe14f4569b0d7a3511e62254fcf5a11148b8259.tar
drakx-backup-do-not-use-8fe14f4569b0d7a3511e62254fcf5a11148b8259.tar.gz
drakx-backup-do-not-use-8fe14f4569b0d7a3511e62254fcf5a11148b8259.tar.bz2
drakx-backup-do-not-use-8fe14f4569b0d7a3511e62254fcf5a11148b8259.tar.xz
drakx-backup-do-not-use-8fe14f4569b0d7a3511e62254fcf5a11148b8259.zip
x86-64 specific changes
-rw-r--r--Makefile1
-rwxr-xr-xmake_boot_img6
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ab939d26c..13c551f8c 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,6 @@ install_only:
ifeq (x86_64,$(ARCH))
rm -rf $(ROOTDEST)/isolinux
cp -af isolinux $(ROOTDEST)
- cp -f images/cdrom-changedisk.img $(ROOTDEST)/images
endif
install live_update $(ROOTDEST)/live_update
diff --git a/make_boot_img b/make_boot_img
index 84057a5d0..c876fa64c 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -76,7 +76,11 @@ foreach (@kernels) {
rename("$img-$main", "$img");
}
}
-if ($arch =~ /i.86|x86_64/ && $img =~ /all/) {
+if ($arch =~ /x86_64/ && $img =~ /all/) {
+ # isolinux is supposed to work on all those new hardware
+ isolinux($main, @kernels);
+}
+if ($arch =~ /i.86/ && $img =~ /all/) {
isolinux($main, @kernels);
my ($img, $img_sav) = ("images/cdrom.img-$main", 'images/cdrom.img-sav');