]>
Commit | Line | Data |
---|---|---|
cc108a69 | 1 | --- grub-1.97.1/util/grub-mkconfig.in~ 2009-11-11 22:14:09.000000000 +0200 |
2 | +++ grub-1.97.1/util/grub-mkconfig.in 2009-11-12 09:50:15.902686831 +0200 | |
3 | @@ -247,18 +247,12 @@ | |
4 | EOF | |
5 | ||
6 | for i in ${grub_mkconfig_dir}/* ; do | |
7 | - case "$i" in | |
8 | - # emacsen backup files. FIXME: support other editors | |
9 | - *~) ;; | |
10 | - *) | |
11 | - if grub_file_is_not_garbage "$i" && test -x "$i" ; then | |
12 | - echo | |
13 | - echo "### BEGIN $i ###" | |
14 | - "$i" | |
15 | - echo "### END $i ###" | |
16 | - fi | |
17 | - ;; | |
18 | - esac | |
19 | + if grub_file_is_not_garbage "$i" && test -x "$i" ; then | |
20 | + echo | |
21 | + echo "### BEGIN $i ###" | |
22 | + "$i" | |
23 | + echo "### END $i ###" | |
24 | + fi | |
25 | done | |
26 | ||
27 | if test "x${grub_cfg}" != "x" ; then | |
28 | --- grub-1.97.1/util/grub-mkconfig_lib.in~ 2009-11-09 17:48:16.000000000 +0200 | |
29 | +++ grub-1.97.1/util/grub-mkconfig_lib.in 2009-11-12 09:52:32.845160944 +0200 | |
30 | @@ -158,6 +158,8 @@ | |
31 | if test -f "$1" ; then | |
32 | case "$1" in | |
33 | *.dpkg-*) return 1 ;; # debian dpkg | |
34 | + *.rpmnew|*.rpmsave) return 1 ;; # Fedora rpm | |
35 | + *.bak|*~|.*.swp) return 1 ;; # backup and swap files from editors | |
36 | esac | |
37 | else | |
38 | return 1 |