vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-mkrescue.in: Avoid module duplication.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-01 23:35:45 +02:00
parent 105a2e8c66
commit b0c4f95642
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-07-01 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkrescue.in: Avoid module duplication.
2010-07-01 Sean Finney <seanius@seanius.net> 2010-07-01 Sean Finney <seanius@seanius.net>
* util/grub.d/10_linux.in: Don't use UUID for LVM root. * util/grub.d/10_linux.in: Don't use UUID for LVM root.

6
util/grub-mkrescue.in
View file

@ -200,13 +200,12 @@ make_image ()
memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"` memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
mkdir -p ${memdisk_dir}/boot/grub mkdir -p ${memdisk_dir}/boot/grub
modules="$(cat ${source_directory}/partmap.lst) ${modules}"
cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
search --fs-uuid --set ${iso_uuid} search --fs-uuid --set ${iso_uuid}
set prefix=(\${root})/boot/grub/${platform} set prefix=(\${root})/boot/grub/${platform}
source \$prefix/grub.cfg source \$prefix/grub.cfg
EOF EOF
(for i in ${modules} ; do (for i in $(cat ${source_directory}/partmap.lst) ${modules} ; do
echo "insmod $i" echo "insmod $i"
done ; \ done ; \
echo "source /boot/grub/grub.cfg") \ echo "source /boot/grub/grub.cfg") \
@ -273,8 +272,7 @@ if test -e "${pc_dir}" ; then
rm -f ${core_img} rm -f ${core_img}
modules="$(cat ${pc_dir}/partmap.lst) ${modules}" (for i in $(cat ${pc_dir}/partmap.lst) ${modules} ; do
(for i in ${modules} ; do
echo "insmod $i" echo "insmod $i"
done ; \ done ; \
echo "source /boot/grub/grub.cfg") \ echo "source /boot/grub/grub.cfg") \