Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos
Commits
6a72c3d6
Commit
6a72c3d6
authored
May 06, 2021
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: Hold start until images are ready
This will minimise amount of needless restarts.
parent
5816dfea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/template/template-kvm-run.in
software/kvm/template/template-kvm-run.in
+5
-0
No files found.
software/kvm/buildout.hash.cfg
View file @
6a72c3d6
...
@@ -55,7 +55,7 @@ md5sum = b7e87479a289f472b634a046b44b5257
...
@@ -55,7 +55,7 @@ md5sum = b7e87479a289f472b634a046b44b5257
[template-kvm-run]
[template-kvm-run]
filename = template/template-kvm-run.in
filename = template/template-kvm-run.in
md5sum =
2909821e8eebfe8928a0a0cfb94c0348
md5sum =
b8cc7c76438212e0522ebede88649393
[template-kvm-controller]
[template-kvm-controller]
filename = template/kvm-controller-run.in
filename = template/kvm-controller-run.in
...
...
software/kvm/template/template-kvm-run.in
View file @
6a72c3d6
...
@@ -361,6 +361,9 @@ else:
...
@@ -361,6 +361,9 @@ else:
'-drive',
'-drive',
'file=%s,media=cdrom' % (link,)
'file=%s,media=cdrom' % (link,)
])
])
else:
raise ValueError('boot-image-url-select not ready yet')
if boot_image_url_list_json_config:
if boot_image_url_list_json_config:
# Support boot-image-url-list
# Support boot-image-url-list
with open(boot_image_url_list_json_config) as fh:
with open(boot_image_url_list_json_config) as fh:
...
@@ -373,6 +376,8 @@ else:
...
@@ -373,6 +376,8 @@ else:
'-drive',
'-drive',
'file=%s,media=cdrom' % (link,)
'file=%s,media=cdrom' % (link,)
])
])
else:
raise ValueError('boot-image-url-list not ready yet')
# Always add by default the default image
# Always add by default the default image
kvm_argument_list.extend([
kvm_argument_list.extend([
'-drive', 'file=%s,media=cdrom' % default_cdrom_iso
'-drive', 'file=%s,media=cdrom' % default_cdrom_iso
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment