rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add grub-2.00-no-canon.patch (#737370)

Browse Source 
backport upstream rev 4408:
Don't canonicalise /dev/root and /dev/dm-*.
This commit is contained in:
Mads Kiilerich 2012-06-04 02:29:21 +02:00
parent 5e9c41e4fe
commit 7045ce64ed
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
grub-2.00-no-canon.patch Normal file
View File

@ -0,0 +1,29 @@
From: Valdimir Serbinenko <phcoder@gmail.com>
Subject: Don't canonicalise /dev/root and /dev/dm-*.
upstream rev 4408
--- a/util/getroot.c 2012-05-28 15:43:12 +0000
+++ b/util/getroot.c 2012-06-02 12:36:27 +0000
@@ -1036,10 +1036,16 @@
{
char *tmp = *cur;
int root, dm;
- *cur = canonicalize_file_name (tmp);
- if (*cur == NULL)
- grub_util_error (_("failed to get canonical path of %s"), tmp);
- free (tmp);
+ if (strcmp (*cur, "/dev/root") == 0
+ || strncmp (*cur, "/dev/dm-", sizeof ("/dev/dm-") - 1) == 0)
+ *cur = tmp;
+ else
+ {
+ *cur = canonicalize_file_name (tmp);
+ if (*cur == NULL)
+ grub_util_error (_("failed to get canonical path of %s"), tmp);
+ free (tmp);
+ }
root = (strcmp (*cur, "/dev/root") == 0);
dm = (strncmp (*cur, "/dev/dm-", sizeof ("/dev/dm-") - 1) == 0);
if (!dm && !root)

1
grub2.spec
View File

@ -51,6 +51,7 @@ Source3: README.Fedora
Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz
Source5: theme.tar.bz2 Source5: theme.tar.bz2
Patch0: grub-2.00-ieee1276.patch Patch0: grub-2.00-ieee1276.patch
Patch1: grub-2.00-no-canon.patch
Patch2: grub-1.99-just-say-linux.patch Patch2: grub-1.99-just-say-linux.patch
Patch5: grub-1.99-ppc-terminfo.patch Patch5: grub-1.99-ppc-terminfo.patch
Patch10: grub-2.00-add-fw_path-search.patch Patch10: grub-2.00-add-fw_path-search.patch