Skip to content
Browse files

Fixed bug in running user-selected kernels

file:// prefix was not being stripped before comparision.
Closes GH-27.
  • Loading branch information...
1 parent cc2d8de commit 649ea77d51384d94edc0751d3a28a8bdfbf376c6 @labisso labisso committed
Showing with 9 additions and 1 deletion.
  1. +4 −1 control/src/python/workspacecontrol/defaults/KernelProcurement.py
  2. +5 −0 docs/src/changelog.html
View
5 control/src/python/workspacecontrol/defaults/KernelProcurement.py
@@ -144,6 +144,9 @@ def kernel_files(self, local_file_set):
kernel = self._check_hdimage(local_file_set, kernel_arg)
if kernel:
return kernel
+
+ if kernel_arg and kernel_arg[:7] == 'file://':
+ kernel_arg = kernel_arg[7:]
if len(self.authz_kernels) == 0:
raise UnexpectedError("there are no authorized kernels and this is not a hdimage rootdisk: cannot proceed")
@@ -161,4 +164,4 @@ def kernel_files(self, local_file_set):
if authzk.name == kernel_arg:
return self._pick_an_authz_kernel(authzk, kernelargs_arg)
- raise UnexpectedError("kernel requested was '%s' but this is not in the authorized kernel list, try again with no special request to get the default kernel/initrd")
+ raise UnexpectedError("kernel requested was '%s' but this is not in the authorized kernel list, try again with no special request to get the default kernel/initrd" % kernel_arg)
View
5 docs/src/changelog.html
@@ -218,6 +218,11 @@
<a href="https://github.com/nimbusproject/nimbus/issues/closed#issue/23">Gzipped images cannot be restarted</a>
</p>
</li>
+ <li>
+ <p>
+ <a href="https://github.com/nimbusproject/nimbus/issues/issue/27">User-selected kernels broken in workspace-control</a>
+ </p>
+ </li>
</ul>
</li>
</ul>

0 comments on commit 649ea77

Please sign in to comment.
Something went wrong with that request. Please try again.