From: Firas Azar <firas.azar@oracle.com>
To: xen-devel@lists.xen.org
Cc: firas.azar@oracle.com
Subject: [PATCH] pygrub: remove isconfig option
Date: Tue, 22 Mar 2016 16:06:39 -0400 [thread overview]
Message-ID: <1458677199-10301-1-git-send-email-firas.azar@oracle.com> (raw)
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 <firas.azar@oracle.com>
---
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
next reply other threads:[~2016-03-22 20:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 20:06 Firas Azar [this message]
2016-03-22 20:22 ` [PATCH] pygrub: remove isconfig option Andrew Cooper
2016-03-22 20:46 ` Firas Azar
2016-03-22 20:54 ` Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458677199-10301-1-git-send-email-firas.azar@oracle.com \
--to=firas.azar@oracle.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).