Attachment 160855 Details for Bug 251225 – fixes to pygrub

[patch] fixes to pygrub

pygrub-dryrun.patch (text/plain), 2.18 KB, created by daniel miles on 2007-08-07 20:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: daniel miles

Created: 2007-08-07 20:41:48 UTC

Size: 2.18 KB

patch

obsolete

>--- a/tools/pygrub/src/pygrub	2007-08-06 13:43:08.000000000 -0600
>+++ b/tools/pygrub/src/pygrub	2007-08-06 13:53:32.000000000 -0600
>@@ -458,9 +458,9 @@
>         print >> sys.stderr, "Usage: %s [-q|--quiet] [--output=] [--entry=] <image>" %(sys.argv[0],)
> 
>     try:
>-        opts, args = getopt.gnu_getopt(sys.argv[1:], 'qh::',
>+        opts, args = getopt.gnu_getopt(sys.argv[1:], 'qhd::',
>                                    ["quiet", "help", "output=", "entry=",
>-                                    "isconfig"])
>+                                    "isconfig", "dryrun"])
>     except getopt.GetoptError:
>         usage()
>         sys.exit(1)
>@@ -474,9 +474,12 @@
>     entry = None
>     interactive = True
>     isconfig = False
>+    dryrun = False
>     for o, a in opts:
>         if o in ("-q", "--quiet"):
>             interactive = False
>+        if o in ("-d", "--dryrun"):
>+            dryrun = True
>         elif o in ("-h", "--help"):
>             usage()
>             sys.exit()
>@@ -536,20 +539,23 @@
>     if fs is None:
>         raise RuntimeError, "Unable to open filesystem"
> 
>-    kernel = fs.open_file(img.kernel[1],).read()
>-    (tfd, fn) = tempfile.mkstemp(prefix="vmlinuz.", dir="/var/lib/xen")
>-    os.write(tfd, kernel)
>-    os.close(tfd)
>-    sxp = "linux (kernel %s)" %(fn,)
>-
>-    if img.initrd:
>-        initrd = fs.open_file(img.initrd[1],).read()
>-        (tfd, fn) = tempfile.mkstemp(prefix="initrd.", dir="/var/lib/xen")
>-        os.write(tfd, initrd)
>+    if(not dryrun):
>+        kernel = fs.open_file(img.kernel[1],).read()
>+        (tfd, fn) = tempfile.mkstemp(prefix="vmlinuz.", dir="/var/lib/xen")
>+        os.write(tfd, kernel)
>         os.close(tfd)
>-        sxp += "(ramdisk %s)" %(fn,)
>+        sxp = "linux (kernel %s)" %(fn,)
>+
>+        if img.initrd:
>+            initrd = fs.open_file(img.initrd[1],).read()
>+            (tfd, fn) = tempfile.mkstemp(prefix="initrd.", dir="/var/lib/xen")
>+            os.write(tfd, initrd)
>+            os.close(tfd)
>+            sxp += "(ramdisk %s)" %(fn,)
>+        else:
>+            initrd = None
>     else:
>-        initrd = None
>+        sxp = "linux (kernel %s)" %(img.kernel[1],)
>     sxp += "(args '%s')" %(img.args,)
> 
>     sys.stdout.flush()

Actions: View | Diff

Attachments on bug 251225: 160855 | 160856 | 160857 | 290768