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
Jean-Paul Smets
slapos
Commits
f1ef9d5f
Commit
f1ef9d5f
authored
Feb 23, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "kvm does not crash nbd is dead"
This reverts commit
a0e1023b
.
parent
a0e1023b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
16 deletions
+1
-16
slapos/recipe/kvm/template/kvm_run.in
slapos/recipe/kvm/template/kvm_run.in
+1
-16
No files found.
slapos/recipe/kvm/template/kvm_run.in
View file @
f1ef9d5f
...
@@ -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
%(qemu_path)s \
exec
%(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,18 +20,3 @@ fi
...
@@ -20,18 +20,3 @@ fi
-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