* util/grub-mknetdir.in: Rename --override-directory to --directory and

document it.
	* tests/util/grub-shell.in: Update to --directory.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-14 15:20:45 +02:00
parent e0595a73b2
commit b9153381b8
2 changed files with 11 additions and 16 deletions

View file

@ -171,7 +171,7 @@ fi
if [ x$boot = xnet ]; then
netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
pkgdatadir="@builddir@" sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir"
pkgdatadir="@builddir@" sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--directory=${builddir}/grub-core" "--net-directory=$netdir"
cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
cp "${source}" "$netdir/boot/grub/testcase.cfg"
. "${builddir}/grub-core/modinfo.sh"