From f58682ccd8bfb6e4f966aad0190ded4a0eea98f6 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 2 Apr 2010 08:52:36 +0000
Subject: 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

---
 draklive | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'draklive')

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) = @$_;
-- 
cgit v1.2.1