Attachment 124983 Details for Bug 182328 – Always delete the /var/lib/xen/xenbl file on error.

[patch] Always delete the /var/lib/xen/xenbl file on error.

xenbl-delete.patch (text/plain), 2.36 KB, created by Stephen Tweedie on 2006-02-21 21:13:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephen Tweedie

Created: 2006-02-21 21:13:00 UTC

Size: 2.36 KB

patch

obsolete

># HG changeset patch
># User sct@sct.boston.redhat.com
># Node ID 065440c0356a0c2fff85bc989481a16f7b228898
># Parent  4ca6f052cdf6f1c18209042e4c9960ca41e75d4b
>Always delete the /var/lib/xen/xenbl file on error.
>
>diff -r 4ca6f052cdf6 -r 065440c0356a tools/python/xen/xend/XendBootloader.py
>--- a/tools/python/xen/xend/XendBootloader.py	Fri Feb 17 11:49:11 2006 +0000
>+++ b/tools/python/xen/xend/XendBootloader.py	Tue Feb 21 14:36:34 2006 -0500
>@@ -40,41 +40,43 @@ def bootloader(blexec, disk, quiet = 0, 
> 
>     os.mkfifo(BL_FIFO, 0600)
> 
>-    child = os.fork()
>-    if (not child):
>-        args = [ blexec ]
>-        if quiet:
>-            args.append("-q")
>-        args.append("--output=%s" %(BL_FIFO,))
>-        if entry is not None:
>-            args.append("--entry=%s" %(entry,))
>-        args.append(disk)
>+    try:
>+        child = os.fork()
>+        if (not child):
>+            args = [ blexec ]
>+            if quiet:
>+                args.append("-q")
>+            args.append("--output=%s" %(BL_FIFO,))
>+            if entry is not None:
>+                args.append("--entry=%s" %(entry,))
>+            args.append(disk)
> 
>-        try:
>-            os.execvp(args[0], args)
>-        except OSError, e:
>-            print e
>-            pass
>-        os._exit(1)
>+            try:
>+                os.execvp(args[0], args)
>+            except OSError, e:
>+                print e
>+                pass
>+            os._exit(1)
> 
>-    while 1:
>-        try:
>-            r = os.open(BL_FIFO, os.O_RDONLY)
>-        except OSError, e:
>-            if e.errno == errno.EINTR:
>-                continue
>-        break
>-    ret = ""
>-    while 1:
>-        select.select([r], [], [])
>-        s = os.read(r, 1024)
>-        ret = ret + s
>-        if len(s) == 0:
>+        while 1:
>+            try:
>+                r = os.open(BL_FIFO, os.O_RDONLY)
>+            except OSError, e:
>+                if e.errno == errno.EINTR:
>+                    continue
>             break
>-        
>-    os.waitpid(child, 0)
>-    os.close(r)
>-    os.unlink(BL_FIFO)
>+        ret = ""
>+        while 1:
>+            select.select([r], [], [])
>+            s = os.read(r, 1024)
>+            ret = ret + s
>+            if len(s) == 0:
>+                break
>+
>+        os.waitpid(child, 0)
>+        os.close(r)
>+    finally:
>+        os.unlink(BL_FIFO)
> 
>     if len(ret) == 0:
>         msg = "Boot loader didn't return any data!"

Actions: View | Diff

Attachments on bug 182328: 124983