diff --git a/lib/cmdlib.py b/lib/cmdlib.py index bb368bb1241ac3cf082575c0239c92d2885693cf..8d5bf9c083beff7de6eddb846b084ca81105b116 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -4054,6 +4054,8 @@ class LUQueryInstanceData(NoHooksLU): "disks": disks, "network_port": instance.network_port, "vcpus": instance.vcpus, + "kernel_path": instance.kernel_path, + "initrd_path": instance.initrd_path, } result[instance.name] = idict diff --git a/scripts/gnt-instance b/scripts/gnt-instance index be32e990647d286d01a4f01ec4d71441327d6b55..f230714f01dd01f32f9585d575ce7b0c77e2c668 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -626,6 +626,18 @@ def ShowInstanceConfig(opts, args): buf.write(" - secondaries: %s\n" % ", ".join(instance["snodes"])) buf.write(" Operating system: %s\n" % instance["os"]) buf.write(" Allocated network port: %s\n" % instance["network_port"]) + if instance["kernel_path"] in (None, constants.VALUE_DEFAULT): + kpath = "(default: %s)" % constants.XEN_KERNEL + else: + kpath = instance["kernel_path"] + buf.write(" Kernel path: %s\n" % kpath) + if instance["initrd_path"] in (None, constants.VALUE_DEFAULT): + initrd = "(default: %s)" % constants.XEN_INITRD + elif instance["initrd_path"] == constants.VALUE_NONE: + initrd = "(none)" + else: + initrd = instance["initrd_path"] + buf.write(" initrd: %s\n" % initrd) buf.write(" Hardware:\n") buf.write(" - VCPUs: %d\n" % instance["vcpus"]) buf.write(" - memory: %dMiB\n" % instance["memory"])