|
 |
f96e0b |
From 62bded903da0a8a30155a757f0a89c3e39b7238c Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
Date: Mon, 10 Dec 2012 11:12:38 +0100
|
|
|
f96e0b |
Subject: [PATCH 060/482] * util/getroot.c
|
|
|
f96e0b |
(convert_system_partition_to_system_disk): Support nbd disks.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 5 +++++
|
|
|
f96e0b |
util/getroot.c | 12 ++++++++++++
|
|
|
f96e0b |
2 files changed, 17 insertions(+)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 0b1596a..547f739 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,5 +1,10 @@
|
|
|
f96e0b |
2012-12-10 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
+ * util/getroot.c (convert_system_partition_to_system_disk): Support
|
|
|
f96e0b |
+ nbd disks.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+2012-12-10 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
* grub-core/fs/ufs.c (grub_ufs_dir): Stop if direntlen is 0 to avoid
|
|
|
f96e0b |
infinite loop on corrupted FS.
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/util/getroot.c b/util/getroot.c
|
|
|
f96e0b |
index c2a25c9..24ce6aa 100644
|
|
|
f96e0b |
--- a/util/getroot.c
|
|
|
f96e0b |
+++ b/util/getroot.c
|
|
|
f96e0b |
@@ -1796,6 +1796,18 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
|
|
|
f96e0b |
return path;
|
|
|
f96e0b |
}
|
|
|
f96e0b |
|
|
|
f96e0b |
+ if (strncmp ("nbd", p, 3) == 0
|
|
|
f96e0b |
+ && p[3] >= '0' && p[3] <= '9')
|
|
|
f96e0b |
+ {
|
|
|
f96e0b |
+ char *ptr = p + 3;
|
|
|
f96e0b |
+ while (*ptr >= '0' && *ptr <= '9')
|
|
|
f96e0b |
+ ptr++;
|
|
|
f96e0b |
+ if (*ptr)
|
|
|
f96e0b |
+ *is_part = 1;
|
|
|
f96e0b |
+ *ptr = 0;
|
|
|
f96e0b |
+ return path;
|
|
|
f96e0b |
+ }
|
|
|
f96e0b |
+
|
|
|
f96e0b |
/* If this is an IDE, SCSI or Virtio disk. */
|
|
|
f96e0b |
if (strncmp ("vdisk", p, 5) == 0
|
|
|
f96e0b |
&& p[5] >= 'a' && p[5] <= 'z')
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|