Changeset 1687:b56d47159e55

Timestamp:

07/01/08 13:17:47 (3 months ago)

Author:

klai@…

Branch:

default

Message:

Make booting more robust when kernel and/or initrd could be missing

Files:

• src/Tycoon/Virtualization/XenUtil.py (modified) (1 diff)

src/Tycoon/Virtualization/XenUtil.py

@@ -250 +250 @@
         if not os.path.exists(account['kernel']):
             account['kernel'] = self.__default_kernel_path
-            OSUtil.modify_append(
-                config_file, re.compile("^kernel = .*$"), 
-                'kernel = "%s"' % account['kernel'])
+
+        if not os.path.exists(account['initrd']):
             account['initrd'] = self.__default_initrd_path
-            OSUtil.modify_append(
-                config_file, re.compile("^ramdisk = .*$"), 
-                'ramdisk = "%s"' % account['initrd'])
+
+        OSUtil.modify_append(
+            config_file, re.compile("^kernel = .*$"), 
+            'kernel = "%s"' % account['kernel'])
+        OSUtil.modify_append(
+            config_file, re.compile("^ramdisk = .*$"), 
+            'ramdisk = "%s"' % account['initrd'])
         
         # Boot the VM