2008-08-31 Colin D Bennett <colin@gibibit.com>
* util/i386/pc/grub-mkrescue.in: Support multiple overlay directories.
This commit is contained in:
parent
c08a6c1877
commit
64d2d53c6b
2 changed files with 10 additions and 4 deletions
|
@ -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>
|
||||
|
||||
* commands/i386/pc/vbeinfo.c (grub_cmd_vbeinfo): Show VBE version and
|
||||
|
|
|
@ -43,6 +43,7 @@ Make GRUB rescue image.
|
|||
-v, --version print the version information and exit
|
||||
--modules=MODULES pre-load specified modules MODULES
|
||||
--overlay=DIR overlay directory DIR in the memdisk image
|
||||
(may be specified multiple times)
|
||||
--pkglibdir=DIR use images from directory DIR instead of ${pkglibdir}
|
||||
--grub-mkimage=FILE use FILE as grub-mkimage
|
||||
--image-type=TYPE select floppy or cdrom (default)
|
||||
|
@ -71,7 +72,7 @@ for option in "$@"; do
|
|||
--modules=*)
|
||||
modules=`echo "$option" | sed 's/--modules=//'` ;;
|
||||
--overlay=*)
|
||||
overlay=`echo "$option" | sed 's/--overlay=//'` ;;
|
||||
overlay=${overlay}${overlay:+ }`echo "$option" | sed 's/--overlay=//'` ;;
|
||||
--pkglibdir=*)
|
||||
input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
|
||||
--grub-mkimage=*)
|
||||
|
@ -124,9 +125,10 @@ for i in ${modules} ; do
|
|||
echo "insmod $i"
|
||||
done > ${aux_dir}/boot/grub/grub.cfg
|
||||
|
||||
if test "x$overlay" = x ; then : ; else
|
||||
cp -dpR ${overlay}/* ${aux_dir}/
|
||||
fi
|
||||
for d in ${overlay}; do
|
||||
echo "Overlaying $d"
|
||||
cp -dpR "${d}"/* "${aux_dir}"/
|
||||
done
|
||||
|
||||
if [ "x${image_type}" = xfloppy -o "x${emulation}" = xfloppy ] ; then
|
||||
# build memdisk
|
||||
|
|
Loading…
Reference in a new issue