diff options
author | root <root@rshg054.dnsready.net> | 2013-08-07 03:03:38 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-08-07 03:03:38 -0700 |
commit | b7d2dcfdb924359a7bdb0614960df38e6e4a9feb (patch) | |
tree | 80a10c5f9d110268b99228832caa676955cc459b /libre/grub | |
parent | a2fb8ff517d83749ec3b5543aeba805f07ea257d (diff) |
Wed Aug 7 02:56:35 PDT 2013
Diffstat (limited to 'libre/grub')
-rw-r--r-- | libre/grub/PKGBUILD | 9 | ||||
-rw-r--r-- | libre/grub/grub-2.00.5086-fix-lvm-parsing.patch | 54 |
2 files changed, 60 insertions, 3 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 2221fb7fe..1db67d42d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -_GRUB_BZR_REV="5043" +_GRUB_BZR_REV="5086" ## grub-extras lua and gpxe fail to build with grub bzr rev 5043 @@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.${_GRUB_BZR_REV} -pkgrel=3 +pkgrel=1 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') @@ -41,12 +41,14 @@ source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revisio 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' 'grub.default' - 'grub-2.00-mkinitcpio-0.15.patch') + 'grub-2.00-mkinitcpio-0.15.patch' + 'grub-2.00.5086-fix-lvm-parsing.patch') md5sums=('SKIP' 'b3068b52b6f1dcd2850b5c7585bb185f' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'd25d2dcf8ba708dcf768fcaea799f59c' + '7a0ce6aa4a23fa12e1f79ab03fe63f88' 'SKIP' 'SKIP') @@ -177,6 +179,7 @@ prepare() { ## fix 10_linux patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch" + patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch" ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac" diff --git a/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch new file mode 100644 index 000000000..9a2eb3ff7 --- /dev/null +++ b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch @@ -0,0 +1,54 @@ +There is no explicit option to turn off alignment; it is implicitly +disabled if one of --separator or --nameprefixes option is used. + +--separator was added in 2007, --nameprefixes - in 2009. So let's use +--separator to extend range of versions we are compatible with. Note that +one or another must be used, current parsing is broken otherwise. + +Signed-off-by: Andrey Borzenkov <address@hidden> + +--- + util/getroot.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/util/getroot.c b/util/getroot.c +index 2ad8a55..3afcf96 100644 +--- a/util/getroot.c ++++ b/util/getroot.c +@@ -1322,7 +1322,7 @@ grub_util_get_dev_abstraction (const char *os_dev) + static void + pull_lvm_by_command (const char *os_dev) + { +- char *argv[6]; ++ char *argv[8]; + int fd; + pid_t pid; + FILE *mdadm; +@@ -1351,12 +1351,17 @@ pull_lvm_by_command (const char *os_dev) + + /* execvp has inconvenient types, hence the casts. None of these + strings will actually be modified. */ ++ /* by default PV name is left aligned in 10 character field, meaning that ++ we do not know where name ends. Using dummy --separator disables ++ alignment. We have a single field, so separator itself is not output */ + argv[0] = (char *) "vgs"; + argv[1] = (char *) "--options"; + argv[2] = (char *) "pv_name"; + argv[3] = (char *) "--noheadings"; +- argv[4] = vgname; +- argv[5] = NULL; ++ argv[4] = (char *) "--separator"; ++ argv[5] = (char *) ":"; ++ argv[6] = vgname; ++ argv[7] = NULL; + + pid = exec_pipe (argv, &fd); + free (vgname); +@@ -1376,6 +1381,7 @@ pull_lvm_by_command (const char *os_dev) + while (getline (&buf, &len, mdadm) > 0) + { + char *ptr; ++ /* LVM adds two spaces as standard prefix */ + for (ptr = buf; ptr < buf + 2 && *ptr == ' '; ptr++); + if (*ptr == '\0') + continue; |