|
 |
416f976 |
--- a/util/getroot.c 2010-03-06 20:51:37.000000000 +0000
|
|
|
416f976 |
+++ b/util/getroot.c 2010-05-28 18:23:19.892788564 +0100
|
|
|
416f976 |
@@ -180,7 +180,8 @@ grub_get_prefix (const char *dir)
|
|
|
416f976 |
|
|
|
416f976 |
static char *
|
|
|
416f976 |
find_root_device (const char *dir __attribute__ ((unused)),
|
|
|
416f976 |
- dev_t dev __attribute__ ((unused)))
|
|
|
416f976 |
+ dev_t dev __attribute__ ((unused))
|
|
|
416f976 |
+ int depth __attribute__ ((unused)))
|
|
|
416f976 |
{
|
|
|
416f976 |
return 0;
|
|
|
416f976 |
}
|
|
|
416f976 |
@@ -188,7 +189,7 @@ find_root_device (const char *dir __attr
|
|
|
416f976 |
#elif ! defined(__CYGWIN__)
|
|
|
416f976 |
|
|
|
416f976 |
static char *
|
|
|
416f976 |
-find_root_device (const char *dir, dev_t dev)
|
|
|
416f976 |
+find_root_device (const char *dir, dev_t dev, int depth)
|
|
|
416f976 |
{
|
|
|
416f976 |
DIR *dp;
|
|
|
416f976 |
char *saved_cwd;
|
|
|
416f976 |
@@ -222,16 +223,27 @@ find_root_device (const char *dir, dev_t
|
|
|
416f976 |
/* Ignore any error. */
|
|
|
416f976 |
continue;
|
|
|
416f976 |
|
|
|
416f976 |
- if (S_ISLNK (st.st_mode))
|
|
|
416f976 |
+ if (S_ISLNK (st.st_mode)) {
|
|
|
416f976 |
+#ifdef __linux__
|
|
|
416f976 |
+ /* If we're in /dev/mapper, follow symbolic links. */
|
|
|
416f976 |
+ if (depth == 1 && strcmp(dir, "mapper") == 0) {
|
|
|
416f976 |
+ if (stat(ent->d_name, &st) == -1)
|
|
|
416f976 |
+ continue;
|
|
|
416f976 |
+ if (S_ISDIR (st.st_mode))
|
|
|
416f976 |
+ continue;
|
|
|
416f976 |
+ }
|
|
|
416f976 |
+#else
|
|
|
416f976 |
/* Don't follow symbolic links. */
|
|
|
416f976 |
continue;
|
|
|
416f976 |
+#endif
|
|
|
416f976 |
+ }
|
|
|
416f976 |
|
|
|
416f976 |
if (S_ISDIR (st.st_mode))
|
|
|
416f976 |
{
|
|
|
416f976 |
/* Find it recursively. */
|
|
|
416f976 |
char *res;
|
|
|
416f976 |
|
|
|
416f976 |
- res = find_root_device (ent->d_name, dev);
|
|
|
416f976 |
+ res = find_root_device (ent->d_name, dev, depth + 1);
|
|
|
416f976 |
|
|
|
416f976 |
if (res)
|
|
|
416f976 |
{
|
|
|
416f976 |
@@ -454,7 +466,7 @@ grub_guess_root_device (const char *dir)
|
|
|
416f976 |
#else
|
|
|
416f976 |
|
|
|
416f976 |
/* This might be truly slow, but is there any better way? */
|
|
|
416f976 |
- os_dev = find_root_device ("/dev", st.st_dev);
|
|
|
416f976 |
+ os_dev = find_root_device ("/dev", st.st_dev, 0);
|
|
|
416f976 |
#endif
|
|
|
416f976 |
#endif /* !__GNU__ */
|
|
|
416f976 |
|