2007-04-17 Robert Millan * 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: Declare enable_update_grub. Install update-grub_SCRIPTS and update-grub_DATA. * configure.ac: Add --enable-update-grub option to enable update-grub. * configure: Regenerate. * conf/common.rmk: Install update-grub components when enable_update_grub is set. * 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. Index: DISTLIST =================================================================== RCS file: /sources/grub/grub2/DISTLIST,v retrieving revision 1.38 diff -u -r1.38 DISTLIST --- DISTLIST 14 Oct 2006 18:59:34 -0000 1.38 +++ DISTLIST 17 Apr 2007 12:06:37 -0000 @@ -258,6 +258,11 @@ 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 Index: Makefile.in =================================================================== RCS file: /sources/grub/grub2/Makefile.in,v retrieving revision 1.24 diff -u -r1.24 Makefile.in --- Makefile.in 10 Apr 2007 21:38:26 -0000 1.24 +++ Makefile.in 17 Apr 2007 12:06:37 -0000 @@ -77,6 +78,7 @@ # Options. enable_grub_emu = @enable_grub_emu@ +enable_update_grub = @enable_update_grub@ ### General variables. @@ -153,6 +155,17 @@ 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 Index: configure.ac =================================================================== RCS file: /sources/grub/grub2/configure.ac,v retrieving revision 1.37 diff -u -r1.37 configure.ac --- configure.ac 10 Apr 2007 21:38:26 -0000 1.37 +++ configure.ac 17 Apr 2007 12:06:37 -0000 @@ -314,6 +314,19 @@ [fi] AC_SUBST([enable_grub_emu]) +AC_ARG_ENABLE([update-grub], + [AS_HELP_STRING([--enable-update-grub], + [build and install the `update-grub' grub.cfg generation utility])]) +[if [ x"$enable_update_grub" = xyes ]; then + # Check for bash.] + AC_PATH_PROG(_BASH, bash) # BASH is a reserved variable, use _BASH instead + if test "x$_BASH" = x; then + AC_MSG_ERROR([bash is required for `update-grub']) + fi + AC_CONFIG_FILES([util/update-grub util/grub.d/00_header util/grub.d/10_hurd util/grub.d/10_linux]) +[fi] +AC_SUBST([enable_update_grub]) + # Output files. AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu include/grub/machine:include/grub/$target_cpu/$platform]) Index: conf/common.mk =================================================================== RCS file: /sources/grub/grub2/conf/common.mk,v retrieving revision 1.20 diff -u -r1.20 common.mk --- conf/common.mk 3 Nov 2006 20:28:04 -0000 1.20 +++ conf/common.mk 17 Apr 2007 12:06:38 -0000 @@ -18,6 +18,11 @@ rm -f $@; sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@ DISTCLEANFILES += grub_emu_init.c +ifeq ($(enable_update_grub), yes) +sbin_UTILITIES += util/update-grub +update-grub_SCRIPTS += util/grub.d/00_header util/grub.d/10_linux util/grub.d/10_hurd +update-grub_DATA += util/grub.d/README +endif # Filing systems. pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \ Index: conf/common.rmk =================================================================== RCS file: /sources/grub/grub2/conf/common.rmk,v retrieving revision 1.12 diff -u -r1.12 common.rmk --- conf/common.rmk 3 Nov 2006 20:28:04 -0000 1.12 +++ conf/common.rmk 17 Apr 2007 12:06:38 -0000 @@ -18,6 +18,11 @@ rm -f $@; sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@ DISTCLEANFILES += grub_emu_init.c +ifeq ($(enable_update_grub), yes) +sbin_UTILITIES += util/update-grub +update-grub_SCRIPTS += util/grub.d/00_header util/grub.d/10_linux util/grub.d/10_hurd +update-grub_DATA += util/grub.d/README +endif # Filing systems. pkgdata_MODULES += fshelp.mod fat.mod ufs.mod ext2.mod \ Index: util/update-grub.in =================================================================== RCS file: util/update-grub.in diff -N util/update-grub.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util/update-grub.in 17 Apr 2007 12:06:38 -0000 @@ -0,0 +1,89 @@ +#! @_BASH@ -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@" + address@hidden@ +grub_prefix=`echo /boot/grub | sed ${transform}` +grub_cfg=${grub_prefix}/grub.cfg +update_grub_dir=${sysconfdir}/grub.d +test_mode=false + +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} && test -d ./grub.d ; then + update_grub_dir=./grub.d + test_mode=true +fi + +if ! which grub-probe > /dev/null ; then + echo "$0: grub-probe not found in PATH." >&2 + exit 1 +fi + +if ! ${test_mode} ; then + 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}`" + +shopt -s nullglob ; for i in ${update_grub_dir}/* ; do + case $i in + # emacsen backup files. FIXME: support other editors + *~) ;; + *) + if test -x $i ; then + echo -e "\n### 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 + mv ${grub_cfg}{.new,} +fi + +echo "done" >&2 Index: util/grub.d/00_header.in =================================================================== RCS file: util/grub.d/00_header.in diff -N util/grub.d/00_header.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util/grub.d/00_header.in 17 Apr 2007 12:06:38 -0000 @@ -0,0 +1,28 @@ +#! @_BASH@ -e + +# update-grub helper script. +# Copyright (C) 2006 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 [ -z "${GRUB_DEFAULT}" ] ; then GRUB_DEFAULT=0 ; fi +if [ -z "${GRUB_TIMEOUT}" ] ; then GRUB_TIMEOUT=5 ; fi + +cat << EOF +set default=${GRUB_DEFAULT} +set timeout=${GRUB_TIMEOUT} +set root=${GRUB_DRIVE} +EOF Index: util/grub.d/10_hurd.in =================================================================== RCS file: util/grub.d/10_hurd.in diff -N util/grub.d/10_hurd.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util/grub.d/10_hurd.in 17 Apr 2007 12:06:38 -0000 @@ -0,0 +1,72 @@ +#! @_BASH@ -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 [ -z "${GRUB_DISTRIBUTOR}" ] ; then + OS=GNU +else + OS="${GRUB_DISTRIBUTOR} GNU/Hurd" +fi + +# FIXME: add l4 here? +kernel= +for i in /boot/gnumach{.gz,} ; 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 + # no hurd here, aborting silently + exit 0 +fi + +if ! ${all_of_them} || ! test -e /lib/ld.so.1 ; then + 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 Index: util/grub.d/10_linux.in =================================================================== RCS file: util/grub.d/10_linux.in diff -N util/grub.d/10_linux.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util/grub.d/10_linux.in 17 Apr 2007 12:06:38 -0000 @@ -0,0 +1,53 @@ +#! @_BASH@ -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 [ -n "${GRUB_DISTRIBUTOR}" ] ; then GRUB_DISTRIBUTOR="${GRUB_DISTRIBUTOR} " ; fi + +shopt -s nullglob + +for linux in /{boot/,}vmlinu[xz]-* ; do + 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 "${GRUB_DISTRIBUTOR}GNU/Linux, 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 "${GRUB_DISTRIBUTOR}GNU/Linux, 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 Index: util/grub.d/README =================================================================== RCS file: util/grub.d/README diff -N util/grub.d/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ util/grub.d/README 17 Apr 2007 12:06:38 -0000 @@ -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.