summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-04-02 08:52:36 +0000
committerOlivier Blin <oblin@mandriva.com>2010-04-02 08:52:36 +0000
commitf58682ccd8bfb6e4f966aad0190ded4a0eea98f6 (patch)
tree609295a748c8a1041c9fbb8045d62989db0fa555
parent6cdce3b6b16d7797071f9bbd3e8fb9f01df8250e (diff)
downloaddraklive-f58682ccd8bfb6e4f966aad0190ded4a0eea98f6.tar
draklive-f58682ccd8bfb6e4f966aad0190ded4a0eea98f6.tar.gz
draklive-f58682ccd8bfb6e4f966aad0190ded4a0eea98f6.tar.bz2
draklive-f58682ccd8bfb6e4f966aad0190ded4a0eea98f6.tar.xz
draklive-f58682ccd8bfb6e4f966aad0190ded4a0eea98f6.zip
do not include whole boot dir in replicator image, boot/vmlinuz would
be duplicate in replicator, which sometimes confuses genisoimage, only include boot/syslinux for replicator
-rwxr-xr-xdraklive3
1 files changed, 2 insertions, 1 deletions
diff --git a/draklive b/draklive
index f2ad052..61756ca 100755
--- a/draklive
+++ b/draklive
@@ -663,6 +663,7 @@ sub create_cdrom_master {
$dest,
$live->get_builddir . $live->{prefix}{build}{boot} . get_syslinux_path($live->{media}, $opts),
$label,
+ $live->get_media_prefix('boot', $opts->{boot}) . '=' . $live->get_builddir . $live->{prefix}{build}{boot},
if_(!$opts->{boot_only},
(map {
$live->get_media_prefix('loopbacks', $opts->{boot}) . $_ .
@@ -703,7 +704,6 @@ sub build_iso_image {
'-boot-load-size', 4, '-boot-info-table',
'-graft-points',
if_($dest, '-o', $dest),
- $live->get_media_prefix('boot', $opts->{boot}) . '=' . $live->get_builddir . $live->{prefix}{build}{boot},
'isolinux=' . $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux',
'isolinux/isolinux.cfg=' . $isolinux_cfg,
'isolinux/isolinux.bin=/usr/lib/syslinux/isolinux.bin',
@@ -1348,6 +1348,7 @@ sub create_cdrom_replicator {
$dest,
$syslinux_cfg,
$label,
+ $live->get_media_prefix('boot', $opts->{boot}) . '/syslinux=' . $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux',
"/images/list=$images_list",
(map {
my ($src, $dest) = @$_;