summaryrefslogtreecommitdiffstats
path: root/features/domains
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-10-19 15:20:00 +0200
committeranonym <anonym@riseup.net>2015-10-20 18:06:43 +0200
commitb7b2a9a7c429af62742e8d9cc8a2e9097acec1e0 (patch)
tree9d339e9bcc38182defa6f253bc9203ea6628a58f /features/domains
parentbdb9612978f89a2055dc8e299883352c070269ea (diff)
parent8a5d4cef0fea6a23f6ccc93dcac0b9c804fe067a (diff)
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts: config/chroot_local-includes/usr/local/bin/tor-browser config/chroot_local-includes/usr/local/sbin/tails-spoof-mac config/chroot_local-includes/usr/local/sbin/tails-unblock-network features/checks.feature features/domains/default.xml features/images/USBCloneAndInstall.png features/images/USBCloneAndUpgrade.png features/images/USBUpgradeFromISO.png features/step_definitions/apt.rb features/step_definitions/checks.rb features/step_definitions/common_steps.rb features/step_definitions/erase_memory.rb features/step_definitions/firewall_leaks.rb features/step_definitions/tor.rb features/step_definitions/usb.rb features/support/helpers/misc_helpers.rb wiki/src/contribute/design.mdwn Notes: * The feature-9672-rework-installer-wording-on-wheezy (of #9572) APT overlay was removed, as was the corresponding automated tests suite images. * We now also use masking of the NetworkManager services in tails-spoof-mac and tails-unblock-network for disabling them.
Diffstat (limited to 'features/domains')
-rw-r--r--features/domains/default.xml25
-rw-r--r--features/domains/default_net.xml1
2 files changed, 5 insertions, 21 deletions
diff --git a/features/domains/default.xml b/features/domains/default.xml
index 0618f10..924bb85 100644
--- a/features/domains/default.xml
+++ b/features/domains/default.xml
@@ -1,5 +1,4 @@
<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
- <name>TailsToaster</name>
<memory unit='KiB'>2097152</memory>
<currentMemory unit='KiB'>2097152</currentMemory>
<vcpu>1</vcpu>
@@ -24,26 +23,17 @@
<source file=''/>
<target dev='hdc' bus='ide'/>
<readonly/>
- <address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
- <controller type='usb' index='0' model='ich9-ehci1'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x7'/>
- </controller>
+ <controller type='usb' index='0' model='ich9-ehci1'/>
<controller type='usb' index='0' model='ich9-uhci1'>
<master startport='0'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0' multifunction='on'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <controller type='virtio-serial' index='0'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</controller>
+ <controller type='ide' index='0'/>
+ <controller type='virtio-serial' index='0'/>
<interface type='network'>
<mac address='52:54:00:ac:dd:ee'/>
<source network='TailsToasterNet'/>
<model type='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
<link state='up'/>
</interface>
<serial type='tcp'>
@@ -53,21 +43,16 @@
<input type='tablet' bus='usb'/>
<channel type='spicevmc'>
<target type='virtio' name='com.redhat.spice.0'/>
- <address type='virtio-serial' controller='0' bus='0' port='1'/>
</channel>
<graphics type='spice' port='-1' tlsPort='-1' autoport='yes'>
<mouse mode='client'/>
</graphics>
- <sound model='ich6'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
- </sound>
+ <sound model='ich6'/>
<video>
<model type='qxl' ram='65536' vram='131072' vgamem='16384' heads='1'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</video>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
- </memballoon>
+ <memballoon model='virtio'/>
</devices>
</domain>
diff --git a/features/domains/default_net.xml b/features/domains/default_net.xml
index d37935b..0b19e89 100644
--- a/features/domains/default_net.xml
+++ b/features/domains/default_net.xml
@@ -1,5 +1,4 @@
<network>
- <name>TailsToasterNet</name>
<forward mode='nat'/>
<bridge name='virbr10' stp='on' delay='0' />
<ip address='10.2.1.1' netmask='255.255.255.0'>