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

2008-08-31 Colin D Bennett <colin@gibibit.com>

Browse source 
* util/i386/pc/grub-mkrescue.in: Support multiple overlay directories.
This commit is contained in:
robertmh 2008-08-31 16:28:32 +00:00
parent c08a6c1877
commit 64d2d53c6b
2 changed files with 10 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 @@
2008-08-31 Colin D Bennett <colin@gibibit.com>
* util/i386/pc/grub-mkrescue.in: Support multiple overlay directories.
2008-08-31 Colin D Bennett <colin@gibibit.com> 2008-08-31 Colin D Bennett <colin@gibibit.com>
* commands/i386/pc/vbeinfo.c (grub_cmd_vbeinfo): Show VBE version and * commands/i386/pc/vbeinfo.c (grub_cmd_vbeinfo): Show VBE version and

10
util/i386/pc/grub-mkrescue.in
View file

@ -43,6 +43,7 @@ Make GRUB rescue image.
-v, --version print the version information and exit -v, --version print the version information and exit
--modules=MODULES pre-load specified modules MODULES --modules=MODULES pre-load specified modules MODULES
--overlay=DIR overlay directory DIR in the memdisk image --overlay=DIR overlay directory DIR in the memdisk image
(may be specified multiple times)
--pkglibdir=DIR use images from directory DIR instead of ${pkglibdir} --pkglibdir=DIR use images from directory DIR instead of ${pkglibdir}
--grub-mkimage=FILE use FILE as grub-mkimage --grub-mkimage=FILE use FILE as grub-mkimage
--image-type=TYPE select floppy or cdrom (default) --image-type=TYPE select floppy or cdrom (default)
@ -71,7 +72,7 @@ for option in "$@"; do
--modules=*) --modules=*)
modules=`echo "$option" | sed 's/--modules=//'` ;; modules=`echo "$option" | sed 's/--modules=//'` ;;
--overlay=*) --overlay=*)
overlay=`echo "$option" | sed 's/--overlay=//'` ;; overlay=${overlay}${overlay:+ }`echo "$option" | sed 's/--overlay=//'` ;;
--pkglibdir=*) --pkglibdir=*)
input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;; input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
--grub-mkimage=*) --grub-mkimage=*)
@ -124,9 +125,10 @@ for i in ${modules} ; do
echo "insmod $i" echo "insmod $i"
done > ${aux_dir}/boot/grub/grub.cfg done > ${aux_dir}/boot/grub/grub.cfg
if test "x$overlay" = x ; then : ; else for d in ${overlay}; do
cp -dpR ${overlay}/* ${aux_dir}/ echo "Overlaying $d"
fi cp -dpR "${d}"/* "${aux_dir}"/
done
if [ "x${image_type}" = xfloppy -o "x${emulation}" = xfloppy ] ; then if [ "x${image_type}" = xfloppy -o "x${emulation}" = xfloppy ] ; then
# build memdisk # build memdisk