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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
c7b7a21c
Commit
c7b7a21c
authored
Nov 25, 2013
by
Cédric de Saint Martin
Committed by
Rafael Monnerat
Jul 09, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[KVM SR] Fix image corruption promise to report 'ok' if there are only leaks.
parent
ea046a0e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
software/kvm/common.cfg
software/kvm/common.cfg
+1
-1
software/kvm/instance-kvm.cfg.jinja2
software/kvm/instance-kvm.cfg.jinja2
+7
-0
No files found.
software/kvm/common.cfg
View file @
c7b7a21c
...
@@ -88,7 +88,7 @@ mode = 0644
...
@@ -88,7 +88,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
mode = 644
md5sum =
36efccfeda60e2990fc71df6264cbe9d
md5sum =
83d1991cb298c87ec7d37e1b8c466417
download-only = true
download-only = true
on-update = true
on-update = true
...
...
software/kvm/instance-kvm.cfg.jinja2
View file @
c7b7a21c
...
@@ -108,6 +108,13 @@ port = ${kvm-instance:vnc-port}
...
@@ -108,6 +108,13 @@ port = ${kvm-instance:vnc-port}
recipe = collective.recipe.template
recipe = collective.recipe.template
input = inline:#!/bin/sh
input = inline:#!/bin/sh
${kvm-instance:qemu-img-path} check ${kvm-instance:disk-path}
${kvm-instance:qemu-img-path} check ${kvm-instance:disk-path}
EXIT_VALUE=$?
# Exit code 3 is used to say "there are leaks but it's ok"
# See http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-img.c;h=b6b5644cb6afaf7441f950c85ff1e652c79bdbff;hb=HEAD#l522
if [[ ! $EXIT_VALUE -eq 0 && ! $EXIT_VALUE -eq 3 ]]; then
exit 1
fi
exit 0
output = ${directory:promises}/kvm-disk-image-corruption
output = ${directory:promises}/kvm-disk-image-corruption
mode = 700
mode = 700
...
...
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