2007-05-04 Robert Millan <rmh@aybabtu.com>
* DISTLIST: Add util/update-grub.in, util/grub.d/00_header.in, util/grub.d/10_hurd.in, util/grub.d/10_linux.in and util/grub.d/README. * Makefile.in: Build update-grub_SCRIPTS. Install update-grub_SCRIPTS and update-grub_DATA. * conf/common.rmk: Build and install update-grub components. * conf/common.mk: Regenerate. * util/update-grub.in: New. Core of update-grub. * util/grub.d/00_header.in: New. Generates grub.cfg header. * util/grub.d/10_hurd.in: New. Generates boot entries for the Hurd. * util/grub.d/10_linux.in: New. Generates boot entries for Linux. * util/grub.d/README: New. Document grub.d directory layout.
This commit is contained in:
robertmh
parent
b06a264da4
commit
ebd97f6e46
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
2007-05-04 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* DISTLIST: Add util/update-grub.in, util/grub.d/00_header.in,
|
||||
util/grub.d/10_hurd.in, util/grub.d/10_linux.in and util/grub.d/README.
|
||||
* Makefile.in: Build update-grub_SCRIPTS. Install update-grub_SCRIPTS
|
||||
and update-grub_DATA.
|
||||
* conf/common.rmk: Build and install update-grub components.
|
||||
* conf/common.mk: Regenerate.
|
||||
* util/update-grub.in: New. Core of update-grub.
|
||||
* util/grub.d/00_header.in: New. Generates grub.cfg header.
|
||||
* util/grub.d/10_hurd.in: New. Generates boot entries for the Hurd.
|
||||
* util/grub.d/10_linux.in: New. Generates boot entries for Linux.
|
||||
* util/grub.d/README: New. Document grub.d directory layout.
|
||||
|
||||
2007-05-01 Robert Millan <rmh@aybabtu.com>
|
||||
|
||||
* util/grub-emu.c: Move initialization functions
|
||||
|
|
|
|||
5
DISTLIST
5
DISTLIST
|
|
@ -258,6 +258,11 @@ util/misc.c
|
|||
util/raid.c
|
||||
util/resolve.c
|
||||
util/unifont2pff.rb
|
||||
util/update-grub.in
|
||||
util/grub.d/00_header.in
|
||||
util/grub.d/10_hurd.in
|
||||
util/grub.d/10_linux.in
|
||||
util/grub.d/README
|
||||
util/i386/efi/grub-mkimage.c
|
||||
util/i386/pc/biosdisk.c
|
||||
util/i386/pc/getroot.c
|
||||
|
|
|
|||
13
Makefile.in
13
Makefile.in
|
|
@ -87,7 +87,7 @@ MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
|
|||
DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
|
||||
$(pkgdata_DATA)
|
||||
PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
|
||||
SCRIPTS = $(sbin_SCRIPTS)
|
||||
SCRIPTS = $(sbin_SCRIPTS) $(update-grub_SCRIPTS)
|
||||
|
||||
CLEANFILES =
|
||||
MOSTLYCLEANFILES =
|
||||
|
|
@ -153,6 +153,17 @@ install-local: all
|
|||
dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
|
||||
$(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
|
||||
done
|
||||
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
|
||||
@list='$(update-grub_SCRIPTS)'; for file in $$list; do \
|
||||
if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
|
||||
dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
|
||||
$(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
|
||||
done
|
||||
@list='$(update-grub_DATA)'; for file in $$list; do \
|
||||
if test -f "$$file"; then dir=; else dir="$(srcdir)"; fi; \
|
||||
dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
|
||||
$(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
|
||||
done
|
||||
|
||||
install-strip:
|
||||
$(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
|
||||
|
|
|
|||
|
|
@ -18,6 +18,33 @@ grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh gr
|
|||
rm -f $@; sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
|
||||
DISTCLEANFILES += grub_emu_init.c
|
||||
|
||||
# For update-grub
|
||||
update-grub: util/update-grub.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
sbin_SCRIPTS += update-grub
|
||||
CLEANFILES += update-grub
|
||||
|
||||
00_header: util/grub.d/00_header.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 00_header
|
||||
CLEANFILES += 00_header
|
||||
|
||||
10_linux: util/grub.d/10_linux.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 10_linux
|
||||
CLEANFILES += 10_linux
|
||||
|
||||
10_hurd: util/grub.d/10_hurd.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 10_hurd
|
||||
CLEANFILES += 10_hurd
|
||||
|
||||
update-grub_DATA += util/grub.d/README
|
||||
|
||||
|
||||
# Filing systems.
|
||||
pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
|
||||
|
|
|
|||
|
|
@ -18,6 +18,33 @@ grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh gr
|
|||
rm -f $@; sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@
|
||||
DISTCLEANFILES += grub_emu_init.c
|
||||
|
||||
# For update-grub
|
||||
update-grub: util/update-grub.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
sbin_SCRIPTS += update-grub
|
||||
CLEANFILES += update-grub
|
||||
|
||||
00_header: util/grub.d/00_header.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 00_header
|
||||
CLEANFILES += 00_header
|
||||
|
||||
10_linux: util/grub.d/10_linux.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 10_linux
|
||||
CLEANFILES += 10_linux
|
||||
|
||||
10_hurd: util/grub.d/10_hurd.in config.status
|
||||
./config.status --file=$@:$<
|
||||
chmod +x $@
|
||||
update-grub_SCRIPTS += 10_hurd
|
||||
CLEANFILES += 10_hurd
|
||||
|
||||
update-grub_DATA += util/grub.d/README
|
||||
|
||||
|
||||
# Filing systems.
|
||||
pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
# update-grub helper script.
|
||||
# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
|
||||
|
||||
|
||||
if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
|
||||
if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
|
||||
|
||||
cat << EOF
|
||||
set default=${GRUB_DEFAULT}
|
||||
set timeout=${GRUB_TIMEOUT}
|
||||
set root=${GRUB_DRIVE}
|
||||
EOF
|
||||
|
||||
if test -e /boot/grub/unifont.pff ; then
|
||||
cat << EOF
|
||||
font /boot/grub/unifont.pff
|
||||
set gfxmode=640x480x32
|
||||
insmod gfxterm
|
||||
insmod vbe
|
||||
terminal gfxterm
|
||||
EOF
|
||||
fi
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
# update-grub helper script.
|
||||
# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
|
||||
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "" ] ; then
|
||||
OS=GNU
|
||||
else
|
||||
OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
|
||||
fi
|
||||
|
||||
# FIXME: add l4 here?
|
||||
kernel=
|
||||
for i in /boot/gnumach.gz /boot/gnumach ; do
|
||||
if test -e $i ; then
|
||||
kernel=$i
|
||||
fi
|
||||
done
|
||||
|
||||
# FIXME: This works for ext2. For other filesystems we might need special-casing
|
||||
case "${GRUB_FS}" in
|
||||
*fs) hurd_fs="${GRUB_FS}" ;;
|
||||
*) hurd_fs="${GRUB_FS}fs" ;;
|
||||
esac
|
||||
|
||||
at_least_one=false
|
||||
all_of_them=true
|
||||
for i in "${kernel}" /hurd/${hurd_fs}.static /hurd/exec ; do
|
||||
if test -e "$i" ; then
|
||||
echo "Found Hurd module: $i" >&2
|
||||
at_least_one=true
|
||||
else
|
||||
all_of_them=false
|
||||
fi
|
||||
done
|
||||
|
||||
if ${at_least_one} ; then : ; else
|
||||
# no hurd here, aborting silently
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
|
||||
echo "Some Hurd stuff found, but not enough to boot." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cat << EOF
|
||||
menuentry "${OS}" {
|
||||
multiboot ${kernel} root=device:${GRUB_DEVICE}
|
||||
module /hurd/${hurd_fs}.static --readonly \\
|
||||
--multiboot-command-line='\${kernel-command-line}' \\
|
||||
--host-priv-port='\${host-port}' \\
|
||||
--device-master-port='\${device-port}' \\
|
||||
--exec-server-task='\${exec-task}' -T typed '\${root}' \\
|
||||
'\$(task-create)' '\$(task-resume)'
|
||||
module /lib/ld.so.1 /hurd/exec '\$(exec-task=task-create)'
|
||||
}
|
||||
EOF
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
# update-grub helper script.
|
||||
# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
|
||||
|
||||
if [ "x${GRUB_DISTRIBUTOR}" = "" ] ; then
|
||||
OS=GNU/Linux
|
||||
else
|
||||
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
|
||||
fi
|
||||
|
||||
|
||||
for linux in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
|
||||
if test -e ${linux} ; then : ; else
|
||||
continue
|
||||
fi
|
||||
echo "Found linux image: $linux" >&2
|
||||
version=`echo $linux | sed -e "s,.*/[^0-9]*-,,g"`
|
||||
basedir=`echo $linux | sed -e "s,/[^/]*$,,g"`
|
||||
cat << EOF
|
||||
menuentry "${OS}, linux ${version}" {
|
||||
linux ${linux} root=${GRUB_DEVICE} ro
|
||||
EOF
|
||||
if test -e ${basedir}/initrd.img-${version} ; then
|
||||
echo "Found initrd image: ${basedir}/initrd.img-${version}" >&2
|
||||
cat << EOF
|
||||
initrd ${basedir}/initrd.img-${version}
|
||||
EOF
|
||||
fi
|
||||
cat << EOF
|
||||
}
|
||||
EOF
|
||||
cat << EOF
|
||||
menuentry "${OS}, linux ${version} (single-user mode)" {
|
||||
linux ${linux} root=${GRUB_DEVICE} ro single
|
||||
EOF
|
||||
if test -e ${basedir}/initrd.img-${version} ; then
|
||||
cat << EOF
|
||||
initrd ${basedir}/initrd.img-${version}
|
||||
EOF
|
||||
fi
|
||||
cat << EOF
|
||||
}
|
||||
EOF
|
||||
done
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
All executable files in this directory are processed in shell expansion order.
|
||||
|
||||
00_*: Reserved for 00_header.
|
||||
10_*: Native boot entries.
|
||||
20_*: Third party apps (e.g. memtest86+).
|
||||
|
||||
The number namespace in-between is configurable by system installer and/or
|
||||
administrator. For example, you can add an entry to boot another OS as
|
||||
01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
|
||||
the menu; and then adjust the default setting via /etc/default/grub.
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
#! /bin/sh -e
|
||||
|
||||
# Generate grub.cfg by inspecting /boot contents.
|
||||
# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program 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 this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
|
||||
|
||||
transform="@program_transform_name@"
|
||||
|
||||
sysconfdir=@sysconfdir@
|
||||
grub_prefix=`echo /boot/grub | sed ${transform}`
|
||||
grub_cfg=${grub_prefix}/grub.cfg
|
||||
update_grub_dir=${sysconfdir}/grub.d
|
||||
test_mode=false
|
||||
|
||||
if [ "x$UID" = "x" ] ; then
|
||||
UID=`id -u`
|
||||
fi
|
||||
|
||||
if [ "$UID" != 0 ] ; then
|
||||
echo "$0: You must run this as root" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$1" = "-y" ] ; then
|
||||
echo "$0: warning: Ignoring -y option (no longer needed)." >&2
|
||||
fi
|
||||
|
||||
if test -d ${update_grub_dir} ; then : ; else
|
||||
if test -d ./grub.d ; then
|
||||
update_grub_dir=./grub.d
|
||||
test_mode=true
|
||||
fi
|
||||
fi
|
||||
|
||||
found=false
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
for i in $PATH ; do
|
||||
if test -x "$i/grub-probe" ; then
|
||||
found=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$old_IFS"
|
||||
if ${found} ; then : ; else
|
||||
echo "$0: grub-probe not found in PATH." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ${test_mode} ; then : ; else
|
||||
exec > ${grub_cfg}.new
|
||||
chmod 444 ${grub_cfg}.new
|
||||
fi
|
||||
|
||||
if test -f ${sysconfdir}/default/grub ; then
|
||||
. ${sysconfdir}/default/grub
|
||||
fi
|
||||
|
||||
echo "Updating ${grub_cfg} ..." >&2
|
||||
|
||||
cat << EOF
|
||||
#
|
||||
# DO NOT EDIT THIS FILE
|
||||
#
|
||||
# It is automaticaly generated by $0 using templates from ${update_grub_dir}
|
||||
#
|
||||
EOF
|
||||
|
||||
export GRUB_DEVICE="`grub-probe --target=device ${grub_prefix}`"
|
||||
export GRUB_DRIVE="`grub-probe --target=drive ${grub_prefix}`"
|
||||
export GRUB_FS="`grub-probe --target=fs ${grub_prefix}`"
|
||||
|
||||
for i in ${update_grub_dir}/* ; do
|
||||
case $i in
|
||||
# emacsen backup files. FIXME: support other editors
|
||||
*~) ;;
|
||||
*)
|
||||
if test -x $i ; then
|
||||
echo
|
||||
echo "### BEGIN $i ###"
|
||||
$i
|
||||
echo "### END $i ###"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# none of the children aborted with error, install the new grub.cfg
|
||||
if ${test_mode} ; then : ; else
|
||||
mv ${grub_cfg}.new ${grub_cfg}
|
||||
fi
|
||||
|
||||
echo "done" >&2
|
||||
Loading…
Reference in New Issue