Magellan Linux

Diff of /trunk/grub/patches/grub-1.99-alx.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1401 by niro, Fri Jul 1 22:24:02 2011 UTC revision 1402 by niro, Sat Jul 2 12:00:25 2011 UTC
# Line 89  diff -Naur grub-1.99/util/grub-install.i Line 89  diff -Naur grub-1.99/util/grub-install.i
89           install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1           install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1
90  diff -Naur grub-1.99/util/grub-mkconfig_lib.in grub-1.99-alx/util/grub-mkconfig_lib.in  diff -Naur grub-1.99/util/grub-mkconfig_lib.in grub-1.99-alx/util/grub-mkconfig_lib.in
91  --- grub-1.99/util/grub-mkconfig_lib.in 2011-04-10 15:29:35.000000000 +0200  --- grub-1.99/util/grub-mkconfig_lib.in 2011-04-10 15:29:35.000000000 +0200
92  +++ grub-1.99-alx/util/grub-mkconfig_lib.in 2011-07-01 22:56:52.000000000 +0200  +++ grub-1.99-alx/util/grub-mkconfig_lib.in 2011-07-02 16:03:20.000000000 +0200
93  @@ -163,7 +163,7 @@  @@ -163,7 +163,7 @@
94       a="$b"       a="$b"
95       b="$c"       b="$c"
# Line 99  diff -Naur grub-1.99/util/grub-mkconfig_ Line 99  diff -Naur grub-1.99/util/grub-mkconfig_
99       return 0       return 0
100     else     else
101       return 1       return 1
102  @@ -225,3 +225,33 @@  @@ -225,3 +225,36 @@
103     done     done
104     return 1     return 1
105   }   }
# Line 124  diff -Naur grub-1.99/util/grub-mkconfig_ Line 124  diff -Naur grub-1.99/util/grub-mkconfig_
124  + local file="$2"  + local file="$2"
125  + local ret  + local ret
126  +  +
127    + # fix /
128    + line="$(echo ${line} | sed 's:/:\\/:g')"
129    +
130  + ret=$(sed "/^${line}$/d" ${file})  + ret=$(sed "/^${line}$/d" ${file})
131  + if [[ -z ${ret} ]]  + if [[ -z ${ret} ]]
132  + then  + then

Legend:
Removed from v.1401  
changed lines
  Added in v.1402