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

2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
* util/grub-mkrescue.in: Use mktemp with explicit template.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-06 17:28:25 +01:00
parent b1f6d291ad
commit 33e2e6f373
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkrescue.in: Use mktemp with explicit template.
2010-03-06 Vladimir Serbinenko <phcoder@gmail.com> 2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/bsd.c (grub_bsd_get_device): Fix a memory leak. * loader/i386/bsd.c (grub_bsd_get_device): Fix a memory leak.

18
util/grub-mkrescue.in
View file

@ -86,7 +86,15 @@ if [ "x${output_image}" = x ] ; then
exit 1 exit 1
fi fi
iso9660_dir=`mktemp -d` if test "x$TMP" != x; then
MKTEMP_TEMPLATE="$TMP/grub-mkrescue.XXXXXXXXXX"
elif test "x$TEMP" != x; then
MKTEMP_TEMPLATE="$TEMP/grub-mkrescue.XXXXXXXXXX"
else
MKTEMP_TEMPLATE="/tmp/grub-mkrescue.XXXXXXXXXX"
fi
iso9660_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
mkdir -p ${iso9660_dir}/boot/grub mkdir -p ${iso9660_dir}/boot/grub
process_input_dir () process_input_dir ()
@ -133,8 +141,8 @@ fi
# build coreboot core.img # build coreboot core.img
if test -e "${coreboot_dir}" ; then if test -e "${coreboot_dir}" ; then
echo "Enabling coreboot support ..." echo "Enabling coreboot support ..."
memdisk_img=`mktemp` memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
memdisk_dir=`mktemp -d` memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
mkdir -p ${memdisk_dir}/boot/grub mkdir -p ${memdisk_dir}/boot/grub
# obtain date-based UUID # obtain date-based UUID
iso_uuid=$(date +%Y-%m-%d-%H-%M-%S-00) iso_uuid=$(date +%Y-%m-%d-%H-%M-%S-00)
@ -162,12 +170,12 @@ fi
# build BIOS core.img # build BIOS core.img
if test -e "${pc_dir}" ; then if test -e "${pc_dir}" ; then
echo "Enabling BIOS support ..." echo "Enabling BIOS support ..."
core_img=`mktemp` core_img=`mktemp "$MKTEMP_TEMPLATE"`
grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \ grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
iso9660 biosdisk iso9660 biosdisk
cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
embed_img=`mktemp` embed_img=`mktemp "$MKTEMP_TEMPLATE"`
cat ${pc_dir}/boot.img ${core_img} > ${embed_img} cat ${pc_dir}/boot.img ${core_img} > ${embed_img}
rm -f ${core_img} rm -f ${core_img}