diff options
| author | Laine Stump <laine@laine.org> | 2013-02-27 10:55:24 -0500 |
|---|---|---|
| committer | Laine Stump <laine@laine.org> | 2013-02-27 10:55:24 -0500 |
| commit | db2536a6273ca6144d29da2f3b87d818a69f7a1d (patch) | |
| tree | f892cdbe5eeae6f4d1fa440604ff366bab6e4096 /tests/networkxml2confdata | |
| parent | 923e4bf810422de1e39f1cd72062a0a0a0e9735b (diff) | |
| download | libvirt-db2536a6273ca6144d29da2f3b87d818a69f7a1d.tar.gz | |
Revert "Add support for <option> tag in network config"
This reverts commit 383ebc46947b0119123880c1ff9ae345fdb8d5f6.
We decided the xml for this feature needed more thought to make sure
we are doing it the best way, in particular wrt option values that
have multiple items.
Diffstat (limited to 'tests/networkxml2confdata')
| -rw-r--r-- | tests/networkxml2confdata/nat-network.conf | 5 | ||||
| -rw-r--r-- | tests/networkxml2confdata/nat-network.xml | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf index ee41e2ae99..beb714b134 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network.conf @@ -12,11 +12,6 @@ bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 dhcp-no-override -dhcp-option=42,192.168.122.20 -dhcp-option=23,50 -dhcp-option=40,libvirt -dhcp-option=252,"\n" -dhcp-option=253," leading and trailing spaces " dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases dhcp-lease-max=253 dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile diff --git a/tests/networkxml2confdata/nat-network.xml b/tests/networkxml2confdata/nat-network.xml index 22ec533de4..eb71d9ea38 100644 --- a/tests/networkxml2confdata/nat-network.xml +++ b/tests/networkxml2confdata/nat-network.xml @@ -8,11 +8,6 @@ <range start='192.168.122.2' end='192.168.122.254' /> <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10' /> <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11' /> - <option number='42' value='192.168.122.20'/> - <option number='23' value='50'/> - <option number='40' value='libvirt'/> - <option number='252' value='\n'/> - <option number='253' value=' leading and trailing spaces '/> </dhcp> </ip> <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> |