Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grub-probe: detect DDF container similar to IMSM #180

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

grub-probe: detect DDF container similar to IMSM #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions grub-core/osdep/linux/getroot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct btrfs_ioctl_search_args {
struct btrfs_ioctl_fs_info_args)

static int
grub_util_is_imsm (const char *os_dev);
grub_util_is_imsm_or_ddf (const char *os_dev);


#define ESCAPED_PATH_MAX (4 * PATH_MAX)
Expand Down Expand Up @@ -635,10 +635,10 @@ get_mdadm_uuid (const char *os_dev)
}

static int
grub_util_is_imsm (const char *os_dev)
grub_util_is_imsm_or_ddf (const char *os_dev)
{
int retry;
int is_imsm = 0;
int is_imsm_or_ddf = 0;
int container_seen = 0;
const char *dev = os_dev;

Expand Down Expand Up @@ -699,10 +699,17 @@ grub_util_is_imsm (const char *os_dev)
if (strncmp (buf, "MD_METADATA=imsm",
sizeof ("MD_METADATA=imsm") - 1) == 0)
{
is_imsm = 1;
is_imsm_or_ddf = 1;
grub_util_info ("%s is imsm", dev);
break;
}
if (strncmp (buf, "MD_METADATA=ddf",
sizeof ("MD_METADATA=ddf") - 1) == 0)
{
is_imsm_or_ddf = 1;
grub_util_info ("%s is ddf", dev);
break;
}
}

free (buf);
Expand All @@ -713,7 +720,7 @@ grub_util_is_imsm (const char *os_dev)

if (dev != os_dev)
free ((void *) dev);
return is_imsm;
return is_imsm_or_ddf;
}

char *
Expand Down Expand Up @@ -1078,7 +1085,7 @@ grub_util_get_dev_abstraction_os (const char *os_dev)

/* Check for RAID. */
if (!strncmp (os_dev, "/dev/md", 7) && ! grub_util_device_is_mapped (os_dev)
&& !grub_util_is_imsm (os_dev))
&& !grub_util_is_imsm_or_ddf (os_dev))
return GRUB_DEV_ABSTRACTION_RAID;
return GRUB_DEV_ABSTRACTION_NONE;
}
Expand Down