Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/grub/patches/grub-1.99-alx.patch

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1402 - (show annotations) (download)
    Sat Jul 2 12:00:25 2011 UTC (12 years, 10 months ago) by niro
    File size: 4258 byte(s) 
    -fixed grubvx() function to respect / in search arguments
    1 diff -Naur grub-1.99/util/grub.d/10_kfreebsd.in grub-1.99-alx/util/grub.d/10_kfreebsd.in
    2 --- grub-1.99/util/grub.d/10_kfreebsd.in 2011-03-29 02:56:38.000000000 +0200
    3 +++ grub-1.99-alx/util/grub.d/10_kfreebsd.in 2011-07-01 22:57:43.000000000 +0200
    4 @@ -188,5 +188,5 @@
    5 kfreebsd_entry "${OS}" "${version}" true "-s"
    6 fi
    7
    8 - list=`echo $list | tr ' ' '\n' | grep -vx $kfreebsd | tr '\n' ' '`
    9 + list=`echo $list | tr ' ' '\n' | grepvx $kfreebsd | tr '\n' ' '`
    10 done
    11 diff -Naur grub-1.99/util/grub.d/10_linux.in grub-1.99-alx/util/grub.d/10_linux.in
    12 --- grub-1.99/util/grub.d/10_linux.in 2011-05-14 22:36:49.000000000 +0200
    13 +++ grub-1.99-alx/util/grub.d/10_linux.in 2011-07-01 22:57:35.000000000 +0200
    14 @@ -81,8 +81,8 @@
    15 cat << EOF
    16 load_video
    17 EOF
    18 - if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
    19 - && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
    20 + if grepqx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
    21 + && grepqx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
    22 cat << EOF
    23 set gfxpayload=keep
    24 EOF
    25 @@ -195,5 +195,5 @@
    26 "single ${GRUB_CMDLINE_LINUX}"
    27 fi
    28
    29 - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
    30 + list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`
    31 done
    32 diff -Naur grub-1.99/util/grub.d/20_linux_xen.in grub-1.99-alx/util/grub.d/20_linux_xen.in
    33 --- grub-1.99/util/grub.d/20_linux_xen.in 2011-04-13 21:20:29.000000000 +0200
    34 +++ grub-1.99-alx/util/grub.d/20_linux_xen.in 2011-07-01 22:57:25.000000000 +0200
    35 @@ -113,7 +113,7 @@
    36 break
    37 fi
    38 done
    39 - if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
    40 + if (grepqx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grepqx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
    41 fi
    42 done`
    43 if [ "x${linux_list}" = "x" ] ; then
    44 @@ -167,8 +167,8 @@
    45 "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
    46 fi
    47
    48 - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
    49 + list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`
    50 done
    51 echo "}"
    52 - xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '`
    53 + xen_list=`echo $xen_list | tr ' ' '\n' | grepvx $current_xen | tr '\n' ' '`
    54 done
    55 diff -Naur grub-1.99/util/grub-install.in grub-1.99-alx/util/grub-install.in
    56 --- grub-1.99/util/grub-install.in 2011-04-03 15:36:21.000000000 +0200
    57 +++ grub-1.99-alx/util/grub-install.in 2011-07-01 22:37:55.000000000 +0200
    58 @@ -59,6 +59,22 @@
    59 removable=no
    60 efi_quiet=
    61
    62 +grepqx()
    63 +{
    64 + local line="$1"
    65 + local file="$2"
    66 + local ret
    67 +
    68 + ret=$(sed -n "/^${line}$/p" ${file})
    69 + if [[ -z ${ret} ]]
    70 + then
    71 + return 1
    72 + else
    73 + return 0
    74 + fi
    75 +}
    76 +
    77 +
    78 # Get GRUB_DISTRIBUTOR.
    79 if test -f "${sysconfdir}/default/grub" ; then
    80 . "${sysconfdir}/default/grub"
    81 @@ -510,7 +526,7 @@
    82
    83 if [ "x${devabstraction_module}" = "x" ] ; then
    84 if [ x"${install_device}" != x ]; then
    85 - if echo "${install_device}" | grep -qx "(.*)" ; then
    86 + if echo "${install_device}" | grepqx "(.*)" ; then
    87 install_drive="${install_device}"
    88 else
    89 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
    91 --- 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-02 16:03:20.000000000 +0200
    93 @@ -163,7 +163,7 @@
    94 a="$b"
    95 b="$c"
    96 fi
    97 - if (echo "$a" ; echo "$b") | sort -n | head -n 1 | grep -qx "$b" ; then
    98 + if (echo "$a" ; echo "$b") | sort -n | head -n 1 | grepqx "$b" ; then
    99 return 0
    100 else
    101 return 1
    102 @@ -225,3 +225,36 @@
    103 done
    104 return 1
    105 }
    106 +grepqx()
    107 +{
    108 + local line="$1"
    109 + local file="$2"
    110 + local ret
    111 +
    112 + ret=$(sed -n "/^${line}$/p" ${file})
    113 + if [[ -z ${ret} ]]
    114 + then
    115 + return 1
    116 + else
    117 + return 0
    118 + fi
    119 +}
    120 +
    121 +grepvx()
    122 +{
    123 + local line="$1"
    124 + local file="$2"
    125 + local ret
    126 +
    127 + # fix /
    128 + line="$(echo ${line} | sed 's:/:\\/:g')"
    129 +
    130 + ret=$(sed "/^${line}$/d" ${file})
    131 + if [[ -z ${ret} ]]
    132 + then
    133 + return 1
    134 + else
    135 + echo "${ret}"
    136 + return 0
    137 + fi
    138 +}