The pygrub command option "isconfig" is broken and obsolete. This patch removes
it since the alternate options "-l -n" provide the same functionality.
Signed-off-by: Firas Azar
---
tools/pygrub/src/pygrub | 21 +
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 40f9584..82d4f01 100755
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -776,10 +776,11 @@ if __name__ == "__main__":
try:
opts, args = getopt.gnu_getopt(sys.argv[1:], 'qilnh::',
- ["quiet", "interactive", "list-entries",
"not-really", "help",
-"output=", "output-format=",
"output-directory=", "offset=",
-"entry=", "kernel=",
-"ramdisk=", "args=", "isconfig", "debug"])
+ ["quiet", "interactive", "list-entries",
+"not-really", "help", "output=",
+"output-format=", "output-directory=",
+"offset=", "entry=", "kernel=",
+"ramdisk=", "args=", "debug"])
except getopt.GetoptError:
usage()
sys.exit(1)
@@ -793,7 +794,6 @@ if __name__ == "__main__":
entry = None
interactive = True
list_entries = False
-isconfig = False
part_offs = None
debug = False
not_really = False
@@ -838,8 +838,6 @@ if __name__ == "__main__":
entry = a
# specifying the entry to boot implies non-interactive
interactive = False
-elif o in ("--isconfig",):
-isconfig = True
elif o in ("--debug",):
debug = True
elif o in ("--output-format",):
@@ -871,15 +869,6 @@ if __name__ == "__main__":
else:
fd = os.open(output, os.O_WRONLY)
-# debug
-if isconfig:
-chosencfg = run_grub(file, entry, fs, incfg["args"])
-print " kernel: %s" % chosencfg["kernel"]
-if chosencfg["ramdisk"]:
-print " initrd: %s" % chosencfg["ramdisk"]
-print " args: %s" % chosencfg["args"]
-sys.exit(0)
-
# if boot filesystem is set then pass to fsimage.open
bootfsargs = '"%s"' % incfg["args"]
bootfsgroup = re.findall('zfs-bootfs=(.*?)[\s\,\"]', bootfsargs)
--
1.9.1
___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel