From 13774a2f941452fe3bf15fd3e202373df08a1fd7 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Sat, 21 Nov 2009 13:22:41 +0000 Subject: [PATCH] 2009-11-21 Robert Millan * util/grub-mkrescue.in: Use source directory direcly (without copiing or hardlinking it). Remove -J option, Joliet is not compatible with multiple source directories. --- ChangeLog | 6 ++++++ util/grub-mkrescue.in | 9 +-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34518b011..64ea5f7b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-21 Robert Millan + + * util/grub-mkrescue.in: Use source directory direcly (without copiing + or hardlinking it). Remove -J option, Joliet is not compatible with + multiple source directories. + 2009-11-21 Carles Pina i Estany 2009-11-21 Robert Millan diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index 23ac4e1e8..6f7d3338c 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -142,13 +142,6 @@ EOF grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)" fi -if [ "${source}" != "" ] ; then - for d in ${source}; do - echo "Processing $d" - cp -dpRl "${d}" ${iso9660_dir}/ - done -fi - # build eltorito core.img if test -e "${pc_dir}" ; then echo "Generates eltorito" @@ -170,7 +163,7 @@ if test -e "${pc_dir}" ; then fi # build iso image -grub-mkisofs ${grub_mkisofs_arguments} -o ${output_image} -r -J ${iso9660_dir} +grub-mkisofs ${grub_mkisofs_arguments} -o ${output_image} -r ${iso9660_dir} ${source} rm -rf ${iso9660_dir} exit 0