Commit 037cbde3 authored by Martin Michlmayr's avatar Martin Michlmayr

Use netcfg/disable_autoconfig instead of netcfg/disable_dhcp

parent 7e1ef450
......@@ -3,6 +3,8 @@ oldsys-preseed (3.13) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* Ignore a missing gateway with DHCP, thanks Eugeniy Meshcheryako.
Closes: #687212
* Use netcfg/disable_autoconfig instead of netcfg/disable_dhcp.
Closes: #689531
[ Christian Perrier ]
* Add myself to Uploaders
......
......@@ -227,7 +227,7 @@ generate_preseed_file() {
if [ "$NET_CONFIG" = "static" ]; then
write_static_network "$1"
add "$1" "netcfg/confirm_static" "boolean" "true"
add "$1" "netcfg/disable_dhcp" "boolean" "true"
add "$1" "netcfg/disable_autoconfig" "boolean" "true"
else
add "$1" "netcfg/use_dhcp" "boolean" "true"
fi
......
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.0.254
d-i netcfg/get_nameservers string 192.168.0.254 192.168.0.255
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string home
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.0.10
d-i netcfg/get_nameservers string 192.168.0.10
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string test
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.1.1
d-i netcfg/get_nameservers string 192.168.1.1
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string test
......@@ -3,6 +3,6 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.1.1
d-i netcfg/get_nameservers string 195.3.96.69 192.168.1.1
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string test
d-i netcfg/get_domain string cyrius.com
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.0.254
d-i netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string home
......@@ -4,4 +4,4 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.0.254
d-i netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.1.1
d-i netcfg/get_nameservers string 213.33.99.70
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string foobar
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string none
d-i netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string home
......@@ -4,5 +4,5 @@ d-i netcfg/get_netmask string 255.255.255.0
d-i netcfg/get_gateway string 192.168.1.4
d-i netcfg/get_nameservers string 213.33.99.70
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string foobar
......@@ -4,6 +4,6 @@ d-i netcfg/get_netmask string 255.255.0.0
d-i netcfg/get_gateway string 192.168.0.1
d-i netcfg/get_nameservers string 192.168.0.1 192.168.0.2
d-i netcfg/confirm_static boolean true
d-i netcfg/disable_dhcp boolean true
d-i netcfg/disable_autoconfig boolean true
d-i netcfg/get_hostname string n2100
d-i netcfg/get_domain string daka.thg.se
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment