Re: [PATCH] fix grub-probe fail on by-(id|uuid|path) device names
I'm cherry picking your patch into our package and will let you know
once I found any problem.
Btw, When I'm working on this, I'm not sure the *is_part = 1 should
also be set somewhere after devmapper_out: ? Please correct me if I'm
wrong.
devmapper_out:
if (! mapper_name node)
{
/* This is a DM-RAID disk, not a partition. */
mapper_name = dm_tree_node_get_name (node);
if (! mapper_name)
grub_dprintf (hostdisk, %s has no DM name\n, path);
}
+ else
+ *is_part = 1;
Thanks a lot for babysitting my patch. :)
Regards,
Michael
在 2012年4月20日下午9:04，Vladimir 'φ-coder/phcoder' Serbinenko phco...@gmail.com 寫道：
On 20.04.2012 13:40, Michael Chang wrote:
This patch fixes grub-probe fails on probing devices under
/dev/disk/by-id and other similar mount-by alias names. The method
used to determine the whole disk is by it's name without numeric
character end, but this may be wrong for the by-(id|uuid|path) names
as they are not necessary ended without numeric character. For
instance, my disk was named
/dev/disk/by-id/ata-WDC_WD1600BEKT-60V5T1_WD-WXK0A69Y4761.
The fix is use resolved link to kernel device names (like /dev/sda)
instead of these alias names.
Downstream bug:
https://bugzilla.novell.com/show_bug.cgi?id=757746
___
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
--
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
___
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
___
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH] fix grub-probe fail on by-(id|uuid|path) device names
On 23.04.2012 09:29, Michael Chang wrote: I'm cherry picking your patch into our package and will let you know once I found any problem. Btw, When I'm working on this, I'm not sure the *is_part = 1 should also be set somewhere after devmapper_out: ? Please correct me if I'm wrong. No it shouldn't. There is only one place where we handle partitions on devmapper code branch. It's just after get_linear_info call. -- Regards Vladimir 'φ-coder/phcoder' Serbinenko signature.asc Description: OpenPGP digital signature ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
[PATCH] fix grub-probe fail on by-(id|uuid|path) device names
This patch fixes grub-probe fails on probing devices under
/dev/disk/by-id and other similar mount-by alias names. The method
used to determine the whole disk is by it's name without numeric
character end, but this may be wrong for the by-(id|uuid|path) names
as they are not necessary ended without numeric character. For
instance, my disk was named
/dev/disk/by-id/ata-WDC_WD1600BEKT-60V5T1_WD-WXK0A69Y4761.
The fix is use resolved link to kernel device names (like /dev/sda)
instead of these alias names.
Downstream bug:
https://bugzilla.novell.com/show_bug.cgi?id=757746
=== modified file 'util/getroot.c'
--- util/getroot.c 2012-03-31 10:27:10 +
+++ util/getroot.c 2012-04-20 11:06:18 +
@@ -2093,7 +2093,16 @@
static int
device_is_wholedisk (const char *os_dev)
{
- int len = strlen (os_dev);
+ int len;
+ char os_dev_realpath[PATH_MAX];
+
+ if (strncmp (os_dev, /dev/disk/by-id/, 16) == 0 ||
+ strncmp (os_dev, /dev/disk/by-uuid/, 18) == 0 ||
+ strncmp (os_dev, /dev/disk/by-path/, 18) == 0)
+if (realpath (os_dev, os_dev_realpath))
+ os_dev = os_dev_realpath;
+
+ len = strlen (os_dev);
if (os_dev[len - 1] '0' || os_dev[len - 1] '9')
return 1;
___
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH] fix grub-probe fail on by-(id|uuid|path) device names
On 20.04.2012 13:40, Michael Chang wrote: This patch fixes grub-probe fails on probing devices under /dev/disk/by-id and other similar mount-by alias names. The method used to determine the whole disk is by it's name without numeric character end, but this may be wrong for the by-(id|uuid|path) names as they are not necessary ended without numeric character. For instance, my disk was named /dev/disk/by-id/ata-WDC_WD1600BEKT-60V5T1_WD-WXK0A69Y4761. The fix is use resolved link to kernel device names (like /dev/sda) instead of these alias names. Downstream bug: https://bugzilla.novell.com/show_bug.cgi?id=757746 This patch isn't correct. One of the problems is the use of PATH_MAX instead of our own realpath wrapper. Another, more serious one is that realpath would transform a symlink to any of /dev/mapper/* to dm-X which isn't really usable. Instead we should find out how the untransformed name landed into this part. ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel -- Regards Vladimir 'φ-coder/phcoder' Serbinenko signature.asc Description: OpenPGP digital signature ___ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH] fix grub-probe fail on by-(id|uuid|path) device names
On 20.04.2012 13:40, Michael Chang wrote:
This patch fixes grub-probe fails on probing devices under
/dev/disk/by-id and other similar mount-by alias names. The method
used to determine the whole disk is by it's name without numeric
character end, but this may be wrong for the by-(id|uuid|path) names
as they are not necessary ended without numeric character. For
instance, my disk was named
/dev/disk/by-id/ata-WDC_WD1600BEKT-60V5T1_WD-WXK0A69Y4761.
The fix is use resolved link to kernel device names (like /dev/sda)
instead of these alias names.
Downstream bug:
https://bugzilla.novell.com/show_bug.cgi?id=757746
___
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
--
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
=== modified file 'util/getroot.c'
--- util/getroot.c 2012-03-31 10:27:10 +
+++ util/getroot.c 2012-04-20 13:01:53 +
@@ -1642,10 +1642,14 @@
}
static char *
-convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
+convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
+ int *is_part)
{
#if defined(__linux__)
char *path = xmalloc (PATH_MAX);
+
+ *is_part = 0;
+
if (! realpath (os_dev, path))
return NULL;
@@ -1658,7 +1662,10 @@
{
p = strstr (p, part);
if (p)
- strcpy (p, disc);
+ {
+ *is_part = 1;
+ strcpy (p, disc);
+ }
return path;
}
@@ -1668,7 +1675,10 @@
{
p = strstr (p, part);
if (p)
- strcpy (p, disc);
+ {
+ *is_part = 1;
+ strcpy (p, disc);
+ }
return path;
}
@@ -1679,7 +1689,10 @@
/* /dev/rd/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1690,7 +1703,10 @@
/* /dev/rd/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1700,7 +1716,10 @@
/* /dev/cciss/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1711,7 +1730,10 @@
/* /dev/ida/c[0-9]+d[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1720,6 +1742,8 @@
if (strncmp (i2o/hd, p, sizeof (i2o/hd) - 1) == 0)
{
/* /dev/i2o/hd[a-z]([0-9]+)? */
+ if (p[sizeof (i2o/hda) - 1])
+ *is_part = 1;
p[sizeof (i2o/hda) - 1] = '\0';
return path;
}
@@ -1730,7 +1754,10 @@
/* /dev/mmcblk[0-9]+(p[0-9]+)? */
p = strchr (p, 'p');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
return path;
}
@@ -1741,6 +1768,8 @@
char *ptr = p + 2;
while (*ptr = '0' *ptr = '9')
ptr++;
+ if (*ptr)
+ *is_part = 1;
*ptr = 0;
return path;
}
@@ -1750,6 +1779,8 @@
p[5] = 'a' p[5] = 'z')
{
/* /dev/vdisk[a-z][0-9]* */
+ if (p[6])
+ *is_part = 1;
p[6] = '\0';
return path;
}
@@ -1761,6 +1792,8 @@
char *pp = p + 2;
while (*pp = 'a' *pp = 'z')
pp++;
+ if (*pp)
+ *is_part = 1;
/* /dev/[hsv]d[a-z]+[0-9]* */
*pp = '\0';
return path;
@@ -1772,16 +1805,16 @@
char *pp = p + 3;
while (*pp = 'a' *pp = 'z')
pp++;
+ if (*pp)
+ *is_part = 1;
/* /dev/xvd[a-z]+[0-9]* */
*pp = '\0';
return path;
}
#ifdef HAVE_DEVICE_MAPPER
- /* If this is a DM-RAID device.
- Compare os_dev rather than path here, since nodes under
- /dev/mapper/ are often symlinks. */
- if ((strncmp (/dev/mapper/, os_dev, 12) == 0))
+ if ((strncmp (/dev/mapper/, path, sizeof (/dev/mapper/) - 1) == 0)
+ || (strncmp (/dev/dm-, path, sizeof (/dev/dm-) - 1) == 0))
{
struct dm_tree *tree;
uint32_t maj, min;
@@ -1843,6 +1876,7 @@
grub_util_get_dm_node_linear_info (node_name,
major, minor))
{
+ *is_part = 1;
if (tree)
dm_tree_free (tree);
free (path);
@@ -1914,14 +1948,21 @@
{
char *p = strchr (path + 7, 's');
if (p)
- *p = '\0';
+ {
+ *is_part = 1;
+ *p = '\0';
+ }
}
return path;
#elif defined(__CYGWIN__)
char *path = xstrdup (os_dev);
- if (strncmp (/dev/sd, path, 7) == 0 'a' = path[7] path[7] = 'z')
-path[8] = 0;
+ if (strncmp (/dev/sd, path, 7) == 0 'a' = path[7] path[7] = 'z'
+ path[8])
+{
+ *is_part = 1;
+ path[8] = 0;
+}
return path;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -1930,6 +1971,8 @@
return xstrdup (os_dev);
grub_util_follow_gpart_up (os_dev + sizeof (/dev/) - 1, NULL, out);
+ if (grub_strcmp (os_dev + sizeof (/dev/) - 1, out) != 0)
+*is_part = 1;
out2 = xasprintf (/dev/%s, out);
free (out);
@@
