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

2008-01-10 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/update-grub_lib.in (grub_file_is_not_garbage): New function.
        Determines if a file is garbage left by packaging systems, etc.
        * util/update-grub.in: Use grub_file_is_not_garbage() as a condition
        for processing /etc/grub.d scripts.
        * util/grub.d/10_hurd.in: Fix `GRUB_DISTRIBUTOR' comparison.
        * util/grub.d/10_linux.in: Likewise.  Use grub_file_is_not_garbage()
        as a condition for processing Linux images.
This commit is contained in:
robertmh 2008-01-10 13:52:24 +00:00
parent 87888032b6
commit 2f80039de8
5 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-01-10 Robert Millan <rmh@aybabtu.com>
* util/update-grub_lib.in (grub_file_is_not_garbage): New function.
Determines if a file is garbage left by packaging systems, etc.
* util/update-grub.in: Use grub_file_is_not_garbage() as a condition
for processing /etc/grub.d scripts.
* util/grub.d/10_hurd.in: Fix `GRUB_DISTRIBUTOR' comparison.
* util/grub.d/10_linux.in: Likewise. Use grub_file_is_not_garbage()
as a condition for processing Linux images.
2008-01-10 Pavel Roskin <proski@gnu.org> 2008-01-10 Pavel Roskin <proski@gnu.org>
* include/grub/powerpc/libgcc.h (__ucmpdi2): New export. Needed * include/grub/powerpc/libgcc.h (__ucmpdi2): New export. Needed

4
util/grub.d/10_hurd.in
View file

@ -1,7 +1,7 @@
#! /bin/sh -e #! /bin/sh -e
# update-grub helper script. # update-grub helper script.
# Copyright (C) 2006,2007 Free Software Foundation, Inc. # Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
# #
# GRUB is free software: you can redistribute it and/or modify # GRUB is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
# 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/>.
if [ "x${GRUB_DISTRIBUTOR}" = "" ] ; then if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU OS=GNU
else else
OS="${GRUB_DISTRIBUTOR} GNU/Hurd" OS="${GRUB_DISTRIBUTOR} GNU/Hurd"

9
util/grub.d/10_linux.in
View file

@ -1,7 +1,7 @@
#! /bin/sh -e #! /bin/sh -e
# update-grub helper script. # update-grub helper script.
# Copyright (C) 2006,2007 Free Software Foundation, Inc. # Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
# #
# GRUB is free software: you can redistribute it and/or modify # GRUB is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -16,7 +16,10 @@
# 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/>.
if [ "x${GRUB_DISTRIBUTOR}" = "" ] ; then libdir=@libdir@
. ${libdir}/grub/update-grub_lib
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux OS=GNU/Linux
else else
OS="${GRUB_DISTRIBUTOR} GNU/Linux" OS="${GRUB_DISTRIBUTOR} GNU/Linux"
@ -74,7 +77,7 @@ find_latest ()
} }
list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
if test -e $i ; then echo -n "$i " ; fi if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` done`
while [ "x$list" != "x" ] ; do while [ "x$list" != "x" ] ; do

4
util/update-grub.in
View file

@ -1,7 +1,7 @@
#! /bin/sh -e #! /bin/sh -e
# Generate grub.cfg by inspecting /boot contents. # Generate grub.cfg by inspecting /boot contents.
# Copyright (C) 2006,2007 Free Software Foundation, Inc. # Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
# #
# GRUB is free software: you can redistribute it and/or modify # GRUB is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -145,7 +145,7 @@ for i in ${update_grub_dir}/* ; do
# emacsen backup files. FIXME: support other editors # emacsen backup files. FIXME: support other editors
*~) ;; *~) ;;
*) *)
if test -f "$i" && test -x "$i" ; then if grub_file_is_not_garbage "$i" && test -x "$i" ; then
echo echo
echo "### BEGIN $i ###" echo "### BEGIN $i ###"
"$i" "$i"

12
util/update-grub_lib.in
View file

@ -113,3 +113,15 @@ font_path ()
return 1 return 1
} }
grub_file_is_not_garbage ()
{
if test -f "$1" ; then
case "$1" in
*.dpkg-dist|*.dpkg-old|*.dpkg-tmp) return 1 ;; # debian dpkg
esac
else
return 1
fi
return 0
}