diff --git a/ChangeLog b/ChangeLog index e60f1076c..a03294df6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-07-01 Vladimir Serbinenko + + * util/grub-mkrescue.in: Avoid module duplication. + 2010-07-01 Sean Finney * util/grub.d/10_linux.in: Don't use UUID for LVM root. diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in index 4a16558e4..3bfbbddd4 100644 --- a/util/grub-mkrescue.in +++ b/util/grub-mkrescue.in @@ -200,13 +200,12 @@ make_image () memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"` mkdir -p ${memdisk_dir}/boot/grub - modules="$(cat ${source_directory}/partmap.lst) ${modules}" cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg search --fs-uuid --set ${iso_uuid} set prefix=(\${root})/boot/grub/${platform} source \$prefix/grub.cfg EOF - (for i in ${modules} ; do + (for i in $(cat ${source_directory}/partmap.lst) ${modules} ; do echo "insmod $i" done ; \ echo "source /boot/grub/grub.cfg") \ @@ -273,8 +272,7 @@ if test -e "${pc_dir}" ; then rm -f ${core_img} - modules="$(cat ${pc_dir}/partmap.lst) ${modules}" - (for i in ${modules} ; do + (for i in $(cat ${pc_dir}/partmap.lst) ${modules} ; do echo "insmod $i" done ; \ echo "source /boot/grub/grub.cfg") \