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
Aurélien Vermylen
slapos
Commits
a0e1023b
Commit
a0e1023b
authored
Feb 23, 2012
by
Jean-Baptiste Petre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm does not crash nbd is dead
parent
b30a8e88
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
1 deletion
+16
-1
slapos/recipe/kvm/template/kvm_run.in
slapos/recipe/kvm/template/kvm_run.in
+16
-1
No files found.
slapos/recipe/kvm/template/kvm_run.in
View file @
a0e1023b
...
@@ -8,7 +8,7 @@ fi
...
@@ -8,7 +8,7 @@ fi
# TODO: -net nic,model=virtio, but OS installer has to provide the virtio_net
# TODO: -net nic,model=virtio, but OS installer has to provide the virtio_net
# module
# module
exec
%(qemu_path)s \
%(qemu_path)s \
-net nic,macaddr=%(mac_address)s \
-net nic,macaddr=%(mac_address)s \
-smp %(smp_count)s \
-smp %(smp_count)s \
-m %(ram_size)s \
-m %(ram_size)s \
...
@@ -20,3 +20,18 @@ exec %(qemu_path)s \
...
@@ -20,3 +20,18 @@ exec %(qemu_path)s \
-pidfile %(pid_file_path)s \
-pidfile %(pid_file_path)s \
-no-kvm
-no-kvm
# -net tap,ifname=%(tap_interface)s,script=no,downscript=no \
# -net tap,ifname=%(tap_interface)s,script=no,downscript=no \
if [ $? -eq 1 ]
then
%(qemu_path)s \
-net nic,macaddr=%(mac_address)s \
-net tap,ifname=%(tap_interface)s,script=no,downscript=no \
-smp %(smp_count)s \
-m %(ram_size)s \
-drive file=%(disk_path)s,if=virtio,boot=on \
-vnc %(vnc_ip)s:1,ipv4,password \
-boot menu=on \
-qmp unix:%(socket_path)s,server \
-pidfile %(pid_file_path)s
-no-kvm
fi
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