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

Handle newer autotools. Add some missing quotes while on it. 

* Makefile.am (pkglib_DATA): Remove update-grub_lib.
	(pkglib_DATA): Move grub-mkconfig_lib from here ...
	(pkgdata_DATA): ... here.
	* Makefile.util.def (update-grub_lib): Removed.
	* conf/Makefile.common (pkglib_DATA): Removed.
	(pkglib_SCRIPTS): Likewise.
	(pkgdata_DATA): New variable.
	* tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
	needed.
	Add missing quotes.
	Remove unused variable while on it.
	* tests/util/grub-shell.in: Likewise.
	* util/grub-install.in: Likewise.
	* util/grub-mkconfig.in: Likewise.
	* util/grub-mknetdir.in: Likewise.
	* util/grub-mkrescue.in: Likewise.
	* util/grub-mkstandalone.in: Likewise.
	* util/grub.d/00_header.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_illumos.in: Likewise.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub.d/10_netbsd.in: Likewise.
	* util/grub.d/10_windows.in: Likewise.
	* util/grub.d/20_linux_xen.in: Likewise.
	* util/grub.d/30_os-prober.in: Likewise.
	* util/update-grub_lib.in: Removed.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-24 13:17:36 +01:00
parent e555f379be
commit 48b391e9ab
21 changed files with 151 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@ -1,4 +1,36 @@
2012-01-14 Seth Goldberg <seth.goldberg@oracle.com> 2012-01-24 Vladimir Serbinenko <phcoder@gmail.com>
Handle newer autotools. Add some missing quotes while on it.
* Makefile.am (pkglib_DATA): Remove update-grub_lib.
(pkglib_DATA): Move grub-mkconfig_lib from here ...
(pkgdata_DATA): ... here.
* Makefile.util.def (update-grub_lib): Removed.
* conf/Makefile.common (pkglib_DATA): Removed.
(pkglib_SCRIPTS): Likewise.
(pkgdata_DATA): New variable.
* tests/util/grub-shell-tester.in: Replace pkglib with pkgdata where
needed.
Add missing quotes.
Remove unused variable while on it.
* tests/util/grub-shell.in: Likewise.
* util/grub-install.in: Likewise.
* util/grub-mkconfig.in: Likewise.
* util/grub-mknetdir.in: Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mkstandalone.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_illumos.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/update-grub_lib.in: Removed.
2012-01-24 Seth Goldberg <seth.goldberg@oracle.com>
* grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as * grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_recv): Relax checks as
a workaround for intel problem. a workaround for intel problem.

3
Makefile.am
View File

@ -101,8 +101,7 @@ CLEANFILES += widthspec.h
# Install config.h into platformdir # Install config.h into platformdir
platform_HEADERS = config.h platform_HEADERS = config.h
pkglib_DATA += grub-mkconfig_lib pkgdata_DATA += grub-mkconfig_lib
pkglib_DATA += update-grub_lib
if COND_i386_coreboot if COND_i386_coreboot

6
Makefile.util.def
View File

@ -498,12 +498,6 @@ script = {
installdir = noinst; installdir = noinst;
}; };
script = {
name = update-grub_lib;
common = util/update-grub_lib.in;
installdir = noinst;
};
script = { script = {
name = grub-kbdcomp; name = grub-kbdcomp;
common = util/grub-kbdcomp.in; common = util/grub-kbdcomp.in;

3
conf/Makefile.common
View File

@ -137,7 +137,7 @@ KERNEL_HEADER_FILES =
man_MANS = man_MANS =
noinst_DATA = noinst_DATA =
pkglib_DATA = pkgdata_DATA =
bin_SCRIPTS = bin_SCRIPTS =
sbin_SCRIPTS = sbin_SCRIPTS =
bin_PROGRAMS = bin_PROGRAMS =
@ -147,7 +147,6 @@ check_SCRIPTS =
grubconf_DATA = grubconf_DATA =
check_PROGRAMS = check_PROGRAMS =
noinst_SCRIPTS = noinst_SCRIPTS =
pkglib_SCRIPTS =
noinst_PROGRAMS = noinst_PROGRAMS =
grubconf_SCRIPTS = grubconf_SCRIPTS =
noinst_LIBRARIES = noinst_LIBRARIES =

23
tests/util/grub-shell-tester.in
View File

@ -20,17 +20,16 @@ set -e
# Initialize some variables. # Initialize some variables.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ builddir="@builddir@"
builddir=@builddir@
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
# Force build directory components # Force build directory components
PATH=${builddir}:$PATH PATH="${builddir}:$PATH"
export PATH export PATH
# Usage: usage # Usage: usage
@ -85,23 +84,23 @@ done
if [ "x${source}" = x ] ; then if [ "x${source}" = x ] ; then
tmpfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 tmpfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
while read REPLY; do while read REPLY; do
echo $REPLY >> ${tmpfile} echo $REPLY >> "${tmpfile}"
done done
source=${tmpfile} source="${tmpfile}"
fi fi
outfile1=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 outfile1=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1} "@builddir@/grub-shell" --qemu-opts="${qemuopts}" --modules=${modules} "${source}" >"${outfile1}"
outfile2=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 outfile2=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
bash ${source} >${outfile2} bash "${source}" >"${outfile2}"
if ! diff -q ${outfile1} ${outfile2} >/dev/null if ! diff -q "${outfile1}" "${outfile2}" >/dev/null
then then
echo "${source}: GRUB and BASH outputs did not match (see diff -u ${outfile1} ${outfile2})" echo "${source}: GRUB and BASH outputs did not match (see diff -u ${outfile1} ${outfile2})"
status=1 status=1
else else
rm -f ${outfile1} ${outfile2} rm -f "${outfile1}" "${outfile2}"
fi fi
exit $status exit $status

25
tests/util/grub-shell.in
View File

@ -20,11 +20,10 @@ set -e
# Initialize some variables. # Initialize some variables.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ builddir="@builddir@"
builddir=@builddir@
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
@ -32,7 +31,7 @@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
# Force build directory components # Force build directory components
PATH=${builddir}:$PATH PATH="${builddir}:$PATH"
export PATH export PATH
# Usage: usage # Usage: usage
@ -141,9 +140,9 @@ EOF
isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
if [ x$boot != xnet ]; then if [ x$boot != xnet ]; then
sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \ sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
--rom-directory="${rom_directory}" \ --rom-directory="${rom_directory}" \
/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \ "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
${files} >/dev/null 2>&1 ${files} >/dev/null 2>&1
fi fi
if [ x$boot = xhd ]; then if [ x$boot = xhd ]; then
@ -174,12 +173,12 @@ fi
if [ x$boot = xnet ]; then if [ x$boot = xnet ]; then
netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
sh @builddir@/grub-mknetdir --grub-mkimage=${builddir}/grub-mkimage --override-directory=${builddir}/grub-core --net-directory=$netdir sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir"
cp ${cfgfile} $netdir/boot/grub/grub.cfg cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
cp ${source} $netdir/boot/grub/testcase.cfg cp "${source}" "$netdir/boot/grub/testcase.cfg"
${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0 -net nic | cat | tr -d "\r" "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0" -net nic | cat | tr -d "\r"
else else
${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r" "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
fi fi
rm -f "${isofile}" "${imgfile}" rm -f "${isofile}" "${imgfile}"
rm -rf "${rom_directory}" rm -rf "${rom_directory}"

5
util/grub-install.in
View File

@ -21,6 +21,7 @@ transform="@program_transform_name@"
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
sbindir="@sbindir@" sbindir="@sbindir@"
bindir="@bindir@" bindir="@bindir@"
libdir="@libdir@" libdir="@libdir@"
@ -31,8 +32,8 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
target_cpu=@target_cpu@ target_cpu=@target_cpu@
platform=@platform@ platform=@platform@
host_os=@host_os@ host_os=@host_os@
datarootdir=@datarootdir@
pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`" pkglibdir="${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`"
datadir="@datadir@"
localedir="@datadir@/locale" localedir="@datadir@/locale"
self="`basename $0`" self="`basename $0`"
@ -264,7 +265,7 @@ do
esac esac
done done
. ${libdir}/@PACKAGE@/grub-mkconfig_lib . "${datadir}/@PACKAGE@/grub-mkconfig_lib"
if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \ if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \
|| [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then

25
util/grub-mkconfig.in
View File

@ -18,25 +18,26 @@ set -e
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix="@prefix@"
exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
sbindir=@sbindir@ sbindir="@sbindir@"
bindir=@bindir@ bindir="@bindir@"
libdir=@libdir@ sysconfdir="@sysconfdir@"
sysconfdir=@sysconfdir@
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@ host_os=@host_os@
datarootdir=@datarootdir@ datadir="@datadir@"
datadir=@datadir@ pkgdatadir="${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`"
pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
grub_cfg="" grub_cfg=""
grub_mkconfig_dir=${sysconfdir}/grub.d grub_mkconfig_dir="${sysconfdir}"/grub.d
self=`basename $0` self=`basename $0`
grub_probe=${sbindir}/`echo grub-probe | sed "${transform}"` grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`"
grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`"
GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
@ -94,7 +95,7 @@ do
esac esac
done done
. ${libdir}/@PACKAGE@/grub-mkconfig_lib . "${datadir}/@PACKAGE@/grub-mkconfig_lib"
if [ "x$EUID" = "x" ] ; then if [ "x$EUID" = "x" ] ; then
EUID=`id -u` EUID=`id -u`

38
util/grub-mknetdir.in
View File

@ -19,22 +19,20 @@
# Initialize some variables. # Initialize some variables.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
sbindir=@sbindir@ datarootdir="@datarootdir@"
bindir=@bindir@ bindir="@bindir@"
libdir=@libdir@ libdir="@libdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
host_os=@host_os@ host_os=@host_os@
localedir=@datadir@/locale
datarootdir=@datarootdir@
pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
self=`basename $0` self=`basename $0`
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
rootdir=/srv/tftp rootdir=/srv/tftp
grub_prefix=`echo /boot/grub | sed ${transform}` grub_prefix=`echo /boot/grub | sed ${transform}`
modules= modules=
@ -45,13 +43,13 @@ recheck=no
debug=no debug=no
debug_image= debug_image=
subdir=`echo /boot/grub | sed ${transform}` subdir=`echo /boot/grub | sed ${transform}`
pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc pc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc"
ppc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/powerpc-ieee1275 ppc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/powerpc-ieee1275"
sparc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/sparc64-ieee1275 sparc_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/sparc64-ieee1275"
i386_ieee1275_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-ieee1275 i386_ieee1275_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-ieee1275"
efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi efi32_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi"
efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi efi64_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi"
itanium_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi itanium_dir="${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/ia64-efi"
# Usage: usage # Usage: usage
# Print the usage. # Print the usage.
@ -173,12 +171,12 @@ process_input_dir ()
config_opt= config_opt=
mkdir -p "$grubdir" || exit 1 mkdir -p "$grubdir" || exit 1
for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do for file in "${grubdir}"/*.mod "${grubdir}"/*.lst "${grubdir}"/*.img "${grubdir}"/efiemu??.o; do
if test -f $file && [ "`basename $file`" != menu.lst ]; then if test -f "$file" && [ "`basename $file`" != menu.lst ]; then
rm -f $file || exit 1 rm -f "$file" || exit 1
fi fi
done done
for file in ${input_dir}/*.mod; do for file in "${input_dir}"/*.mod; do
if test -f "$file"; then if test -f "$file"; then
cp -f "$file" "$grubdir/" cp -f "$file" "$grubdir/"
fi fi
@ -225,7 +223,7 @@ process_input_dir ()
source ${subdir}/grub.cfg source ${subdir}/grub.cfg
EOF EOF
$grub_mkimage ${config_opt} -d "${input_dir}" -O ${mkimage_target} --output=${grubdir}/core.$ext --prefix=$prefix $modules $netmodules tftp || exit 1 "$grub_mkimage" ${config_opt} -d "${input_dir}" -O ${mkimage_target} "--output=${grubdir}/core.$ext" "--prefix=$prefix" $modules $netmodules tftp || exit 1
echo "Netboot directory for ${platform} created. Configure your DHCP server to point to ${subdir}/${platform}/core.$ext" echo "Netboot directory for ${platform} created. Configure your DHCP server to point to ${subdir}/${platform}/core.$ext"
} }

10
util/grub-mkrescue.in
View File

@ -18,12 +18,14 @@ set -e
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
# Initialize some variables. # Initialize some variables.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ bindir="@bindir@"
libdir="@libdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@

14
util/grub-mkstandalone.in
View File

@ -18,12 +18,14 @@ set -e
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
# Initialize some variables. # Initialize some variables.
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ bindir="@bindir@"
libdir="@libdir@"
PACKAGE_NAME=@PACKAGE_NAME@ PACKAGE_NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_VERSION=@PACKAGE_VERSION@
@ -34,7 +36,7 @@ self=`basename $0`
source_directory= source_directory=
compression=auto compression=auto
format= format=
grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` grub_mkimage="${bindir}/`echo grub-mkimage | sed ${transform}`"
source= source=
# Usage: usage # Usage: usage
@ -184,7 +186,7 @@ memdisk_img=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
(cd "${memdisk_dir}"; tar -cf - * $source) > "${memdisk_img}" (cd "${memdisk_dir}"; tar -cf - * $source) > "${memdisk_img}"
rm -rf "${memdisk_dir}" rm -rf "${memdisk_dir}"
$grub_mkimage -O "${format}" -C "$compression" -d "${source_directory}" -m "${memdisk_img}" -o "$output_image" --prefix='(memdisk)/boot/grub' memdisk tar $modules "$grub_mkimage" -O "${format}" -C "$compression" -d "${source_directory}" -m "${memdisk_img}" -o "$output_image" --prefix='(memdisk)/boot/grub' memdisk tar $modules
rm -rf "${memdisk_img}" rm -rf "${memdisk_img}"
exit 0 exit 0

10
util/grub.d/00_header.in
View File

@ -19,13 +19,13 @@ set -e
transform="@program_transform_name@" transform="@program_transform_name@"
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
libdir=@libdir@ datarootdir="@datarootdir@"
locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}` locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
grub_lang=`echo $LANG | cut -d . -f 1` grub_lang=`echo $LANG | cut -d . -f 1`
. ${libdir}/@PACKAGE@/grub-mkconfig_lib . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
# Do this as early as possible, since other commands might depend on it. # Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules) # (e.g. the `loadfont' command might need lvm or raid modules)
@ -112,7 +112,7 @@ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
done done
if [ "x$serial" = x1 ]; then if [ "x$serial" = x1 ]; then
if ! test -e ${GRUB_PREFIX}/serial.mod ; then if ! test -e "${GRUB_PREFIX}/serial.mod" ; then
echo "Serial terminal not available on this platform." >&2 ; exit 1 echo "Serial terminal not available on this platform." >&2 ; exit 1
fi fi

9
util/grub.d/10_hurd.in
View File

@ -17,11 +17,10 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
libdir=@libdir@ datarootdir="@datarootdir@"
datarootdir=@datarootdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
CLASS="--class gnu --class os" CLASS="--class gnu --class os"

12
util/grub.d/10_illumos.in
View File

@ -17,15 +17,13 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
datarootdir=@datarootdir@
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR="@localedir@"
CLASS="--class os" CLASS="--class os"

12
util/grub.d/10_kfreebsd.in
View File

@ -17,15 +17,13 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
datarootdir=@datarootdir@
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR="@localedir@"
CLASS="--class os" CLASS="--class os"

13
util/grub.d/10_linux.in
View File

@ -17,15 +17,14 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@
datarootdir=@datarootdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR="@localedir@"
CLASS="--class gnu-linux --class gnu --class os" CLASS="--class gnu-linux --class gnu --class os"

12
util/grub.d/10_netbsd.in
View File

@ -17,15 +17,13 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
datarootdir=@datarootdir@
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR="@localedir@"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS="NetBSD" OS="NetBSD"

10
util/grub.d/10_windows.in
View File

@ -17,11 +17,11 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
libdir=@libdir@ datarootdir="@datarootdir@"
datarootdir=@datarootdir@
. ${libdir}/@PACKAGE@/grub-mkconfig_lib . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
case "`uname 2>/dev/null`" in case "`uname 2>/dev/null`" in
CYGWIN*) ;; CYGWIN*) ;;

13
util/grub.d/20_linux_xen.in
View File

@ -17,15 +17,14 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
bindir=@bindir@ datarootdir="@datarootdir@"
libdir=@libdir@
datarootdir=@datarootdir@ . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR=@localedir@ export TEXTDOMAINDIR="@localedir@"
CLASS="--class gnu-linux --class gnu --class os --class xen" CLASS="--class gnu-linux --class gnu --class os --class xen"

8
util/grub.d/30_os-prober.in
View File

@ -17,11 +17,11 @@ set -e
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>. # along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@ prefix="@prefix@"
exec_prefix=@exec_prefix@ exec_prefix="@exec_prefix@"
libdir=@libdir@ datarootdir="@datarootdir@"
. ${libdir}/@PACKAGE@/grub-mkconfig_lib . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
exit 0 exit 0

23
util/update-grub_lib.in
View File

@ -1,23 +0,0 @@
# stub for new grub-mkconfig_lib
# Copyright (C) 2007,2008 Free Software Foundation, Inc.
#
# GRUB is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# GRUB is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
. ${libdir}/@PACKAGE@/grub-mkconfig_lib
grub_warn "update-grub_lib is deprecated, use grub-mkconfig_lib instead"