Introduce new skip_debconf_note function and stop tracking the type of debconf questions.
Signed-off-by: Loïc Minier <l...@debian.org> --- functions | 54 +++++++++++---------- oldsys-preseed | 18 ++++---- tests/arm/dns323-dhcp.preseed | 16 +++--- tests/arm/dns323-static.preseed | 16 +++--- tests/arm/kuroboxpro_dhcp.preseed | 16 +++--- tests/arm/kuroboxpro_static.preseed | 16 +++--- tests/arm/lspro_dhcp.preseed | 16 +++--- tests/arm/lspro_static.preseed | 16 +++--- tests/arm/mv2120_dhcp.preseed | 14 +++--- tests/arm/mv2120_static.preseed | 16 +++--- tests/arm/nslu2.preseed | 16 +++--- tests/arm/nslu2_invalid_hostname.preseed | 14 +++--- tests/arm/nslu2_static.preseed | 16 +++--- tests/arm/nslu2_static_no_dns.preseed | 18 ++++---- tests/arm/nslu2_static_no_gw.preseed | 16 +++--- tests/arm/nslu2_static_no_ip.preseed | 18 ++++---- tests/arm/nslu2_uninitialized.preseed | 16 +++--- tests/arm/qnap_dhcp.preseed | 16 +++--- tests/arm/qnap_static.preseed | 16 +++--- tests/arm/qnap_static_unreachable_gateway.preseed | 18 ++++---- tests/arm/thecus_dhcp.preseed | 16 +++--- tests/arm/thecus_static_not_default.preseed | 18 ++++---- 22 files changed, 199 insertions(+), 197 deletions(-) diff --git a/functions b/functions index e8d69e6..634926d 100644 --- a/functions +++ b/functions @@ -177,12 +177,11 @@ parse_sib_conf() { # Preseed a debconf question to a value and also set it as seen if we're in # non-interactive mode # $1 = question -# $2 = type -- unused -# $3 = value +# $2 = value op_db_set() { - if ! db_set "$1" "$3"; then + if ! db_set "$1" "$2"; then db_register debian-installer/dummy "$1" - db_set "$1" "$3" + db_set "$1" "$2" fi if [ "$NONINTERACTIVE" = "yes" ]; then db_fset "$1" "seen" "true" @@ -198,64 +197,67 @@ op_db_seen() { fi } -# Set a debconf question if it's a note or its value isn't empty +# Set a debconf question if its value isn't empty # $1 = question -# $2 = type -# $3 = value +# $2 = value add() { - if [ -n "$3" -o "$2" = "note" ]; then - op_db_set "$1" "$2" "$3" + if [ -n "$2" ]; then + op_db_set "$1" "$2" fi } # Set a debconf question as seen if its value is empty and if we're in # non-interactive mode, otherwise set its value -# NB: doesn't handle the note type specially # $1 = question -# $2 = type -- unused -# $3 = value +# $2 = value add_or_set_seen() { - if [ -z "$3" -a "$NONINTERACTIVE" = "yes" ]; then + if [ -z "$2" -a "$NONINTERACTIVE" = "yes" ]; then op_db_seen "$1" else - op_db_set "$1" "$2" "$3" + op_db_set "$1" "$2" fi } +# Mark a debconf note as seen +# $1 = question +skip_debconf_note() { + op_db_set "$1" "" +} + # Preseed a static network configuration write_static_network() { - add "netcfg/get_ipaddress" "string" "$IPADDRESS" - add_or_set_seen "netcfg/get_netmask" "string" "$NETMASK" + add "netcfg/get_ipaddress" "$IPADDRESS" + add_or_set_seen "netcfg/get_netmask" "$NETMASK" if [ -z "$GATEWAY" ]; then GATEWAY=none fi - add "netcfg/get_gateway" "string" "$GATEWAY" - add "netcfg/get_nameservers" "string" "$NAMESERVERS" + add "netcfg/get_gateway" "$GATEWAY" + add "netcfg/get_nameservers" "$NAMESERVERS" } # Fall back to a static address if DHCP fails dhcp_fallback() { - add "netcfg/dhcp_failed" "note" - add "netcfg/dhcp_options" "select" "Configure network manually" + skip_debconf_note "netcfg/dhcp_failed" + add "netcfg/dhcp_options" "Configure network manually" write_static_network } # Do the actual preseeding do_oldsys_preseed() { - add "netcfg/choose_interface" "select" "$INTERFACE" + add "netcfg/choose_interface" "$INTERFACE" if [ "$NET_CONFIG" = "static" ]; then write_static_network - add "netcfg/confirm_static" "boolean" "true" - add "netcfg/disable_dhcp" "boolean" "true" + add "netcfg/confirm_static" "true" + add "netcfg/disable_dhcp" "true" else - add "netcfg/use_dhcp" "boolean" "true" + add "netcfg/use_dhcp" "true" fi if [ "$NONINTERACTIVE" = "yes" -o "$HOSTNAME" != "$DEFAULT_HOSTNAME" ]; then if verify_hostname "$HOSTNAME"; then - add "netcfg/get_hostname" "string" "$HOSTNAME" + add "netcfg/get_hostname" "$HOSTNAME" fi fi - add "netcfg/get_domain" "string" "$DOMAIN" + add "netcfg/get_domain" "$DOMAIN" } diff --git a/oldsys-preseed b/oldsys-preseed index 90ac9fd..b635b2b 100755 --- a/oldsys-preseed +++ b/oldsys-preseed @@ -48,7 +48,7 @@ case "`archdetect`" in else INTERFACE=eth1 if [ "$NONINTERACTIVE" = "yes" ]; then - add "hw-detect/load_firmware" "boolean" "false" + add "hw-detect/load_firmware" "false" fi fi sanity_check_static_config @@ -60,7 +60,7 @@ case "`archdetect`" in dhcp_fallback fi if [ "$NONINTERACTIVE" = "yes" ]; then - add "ethdetect/use_firewire_ethernet" "boolean" "false" + add "ethdetect/use_firewire_ethernet" "false" fi fi ;; @@ -305,23 +305,23 @@ esac if [ "$NONINTERACTIVE" = "yes" ]; then # Just continue if d-i enters lowmem mode - add "lowmem/low" "note" + skip_debconf_note "lowmem/low" # Any hostname and domain names assigned from DHCP take precedence # over values set here. However, setting the values still prevents # the questions from being shown, even if values come from dhcp. - add "netcfg/get_hostname" "string" "debian" - add "netcfg/get_domain" "string" "example.org" + add "netcfg/get_hostname" "debian" + add "netcfg/get_domain" "example.org" # I'm not terribly happy to preseed a generic password but I guess # there's no other way on some machines. - add "network-console/password" "password" "install" - add "network-console/password-again" "password" "install" + add "network-console/password" "install" + add "network-console/password-again" "install" # Continue if there is missing firmware at ethdetect, and hope that # it is not actually needed to get on the network. - add "ethdetect/prompt_missing_firmware" "boolean" "false" + add "ethdetect/prompt_missing_firmware" "false" fi # Workaround for broken partconf -add "partconf/already-mounted" "boolean" "false" +add "partconf/already-mounted" "false" do_oldsys_preseed diff --git a/tests/arm/dns323-dhcp.preseed b/tests/arm/dns323-dhcp.preseed index 0c90cb4..d762410 100644 --- a/tests/arm/dns323-dhcp.preseed +++ b/tests/arm/dns323-dhcp.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.0.32 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.0.1 -op_db_set netcfg/get_nameservers string 192.168.0.254 192.168.0.255 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.0.32 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.0.1 +op_db_set netcfg/get_nameservers 192.168.0.254 192.168.0.255 diff --git a/tests/arm/dns323-static.preseed b/tests/arm/dns323-static.preseed index 036ad1a..831e8ae 100644 --- a/tests/arm/dns323-static.preseed +++ b/tests/arm/dns323-static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.2 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.0.254 -op_db_set netcfg/get_nameservers string 192.168.0.254 192.168.0.255 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string home +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.2 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.0.254 +op_db_set netcfg/get_nameservers 192.168.0.254 192.168.0.255 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname home diff --git a/tests/arm/kuroboxpro_dhcp.preseed b/tests/arm/kuroboxpro_dhcp.preseed index cf1bbfd..1f57af8 100644 --- a/tests/arm/kuroboxpro_dhcp.preseed +++ b/tests/arm/kuroboxpro_dhcp.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.11.150 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.11.1 -op_db_set netcfg/get_nameservers string 83.255.249.10 83.255.245.10 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.11.150 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.11.1 +op_db_set netcfg/get_nameservers 83.255.249.10 83.255.245.10 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/kuroboxpro_static.preseed b/tests/arm/kuroboxpro_static.preseed index 71ecfb9..497b447 100644 --- a/tests/arm/kuroboxpro_static.preseed +++ b/tests/arm/kuroboxpro_static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.22 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.0.10 -op_db_set netcfg/get_nameservers string 192.168.0.10 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string test +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.22 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.0.10 +op_db_set netcfg/get_nameservers 192.168.0.10 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname test diff --git a/tests/arm/lspro_dhcp.preseed b/tests/arm/lspro_dhcp.preseed index a6575ce..18c6e55 100644 --- a/tests/arm/lspro_dhcp.preseed +++ b/tests/arm/lspro_dhcp.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.11.150 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.11.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.11.150 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.11.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/lspro_static.preseed b/tests/arm/lspro_static.preseed index a8c4ed1..cfbd667 100644 --- a/tests/arm/lspro_static.preseed +++ b/tests/arm/lspro_static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.1.51 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string test +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.1.51 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname test diff --git a/tests/arm/mv2120_dhcp.preseed b/tests/arm/mv2120_dhcp.preseed index e5aed13..0b08bf0 100644 --- a/tests/arm/mv2120_dhcp.preseed +++ b/tests/arm/mv2120_dhcp.preseed @@ -1,7 +1,7 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.100 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.100 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/mv2120_static.preseed b/tests/arm/mv2120_static.preseed index a2a028a..5d8815d 100644 --- a/tests/arm/mv2120_static.preseed +++ b/tests/arm/mv2120_static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/get_ipaddress string 192.168.1.132 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 195.3.96.69 192.168.1.1 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string test -op_db_set netcfg/get_domain string cyrius.com +op_db_set netcfg/get_ipaddress 192.168.1.132 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 195.3.96.69 192.168.1.1 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname test +op_db_set netcfg/get_domain cyrius.com diff --git a/tests/arm/nslu2.preseed b/tests/arm/nslu2.preseed index a66c313..fce3768 100644 --- a/tests/arm/nslu2.preseed +++ b/tests/arm/nslu2.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.2 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.0.254 -op_db_set netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string home +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.2 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.0.254 +op_db_set netcfg/get_nameservers 192.168.0.254 192.168.0.255 192.168.0.259 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname home diff --git a/tests/arm/nslu2_invalid_hostname.preseed b/tests/arm/nslu2_invalid_hostname.preseed index 1a890a8..8e7df07 100644 --- a/tests/arm/nslu2_invalid_hostname.preseed +++ b/tests/arm/nslu2_invalid_hostname.preseed @@ -1,7 +1,7 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.2 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.0.254 -op_db_set netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.2 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.0.254 +op_db_set netcfg/get_nameservers 192.168.0.254 192.168.0.255 192.168.0.259 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true diff --git a/tests/arm/nslu2_static.preseed b/tests/arm/nslu2_static.preseed index a334593..123548f 100644 --- a/tests/arm/nslu2_static.preseed +++ b/tests/arm/nslu2_static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.1.77 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 213.33.99.70 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string foobar +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.1.77 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 213.33.99.70 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname foobar diff --git a/tests/arm/nslu2_static_no_dns.preseed b/tests/arm/nslu2_static_no_dns.preseed index 7a0e17b..d6c570a 100644 --- a/tests/arm/nslu2_static_no_dns.preseed +++ b/tests/arm/nslu2_static_no_dns.preseed @@ -1,9 +1,9 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.77 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true -op_db_set netcfg/get_hostname string foobar +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.77 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true +op_db_set netcfg/get_hostname foobar diff --git a/tests/arm/nslu2_static_no_gw.preseed b/tests/arm/nslu2_static_no_gw.preseed index 1aaaf38..aed3ca5 100644 --- a/tests/arm/nslu2_static_no_gw.preseed +++ b/tests/arm/nslu2_static_no_gw.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.2 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string none -op_db_set netcfg/get_nameservers string 192.168.0.254 192.168.0.255 192.168.0.259 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string home +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.2 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway none +op_db_set netcfg/get_nameservers 192.168.0.254 192.168.0.255 192.168.0.259 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname home diff --git a/tests/arm/nslu2_static_no_ip.preseed b/tests/arm/nslu2_static_no_ip.preseed index 78b5002..4f3d77f 100644 --- a/tests/arm/nslu2_static_no_ip.preseed +++ b/tests/arm/nslu2_static_no_ip.preseed @@ -1,9 +1,9 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.77 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 213.33.99.70 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true -op_db_set netcfg/get_hostname string foobar +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.77 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 213.33.99.70 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true +op_db_set netcfg/get_hostname foobar diff --git a/tests/arm/nslu2_uninitialized.preseed b/tests/arm/nslu2_uninitialized.preseed index cbdae2d..d06f1f1 100644 --- a/tests/arm/nslu2_uninitialized.preseed +++ b/tests/arm/nslu2_uninitialized.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.77 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.77 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/qnap_dhcp.preseed b/tests/arm/qnap_dhcp.preseed index 0ba6025..c8d4b29 100644 --- a/tests/arm/qnap_dhcp.preseed +++ b/tests/arm/qnap_dhcp.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.100 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.100 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/qnap_static.preseed b/tests/arm/qnap_static.preseed index 8c61544..ba7f1a0 100644 --- a/tests/arm/qnap_static.preseed +++ b/tests/arm/qnap_static.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.1.139 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.4 -op_db_set netcfg/get_nameservers string 213.33.99.70 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string foobar +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.1.139 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.4 +op_db_set netcfg/get_nameservers 213.33.99.70 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname foobar diff --git a/tests/arm/qnap_static_unreachable_gateway.preseed b/tests/arm/qnap_static_unreachable_gateway.preseed index 6e7c75b..364a93a 100644 --- a/tests/arm/qnap_static_unreachable_gateway.preseed +++ b/tests/arm/qnap_static_unreachable_gateway.preseed @@ -1,9 +1,9 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.100 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 213.33.99.70 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true -op_db_set netcfg/get_hostname string foobar +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.100 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 213.33.99.70 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true +op_db_set netcfg/get_hostname foobar diff --git a/tests/arm/thecus_dhcp.preseed b/tests/arm/thecus_dhcp.preseed index 0ba6025..c8d4b29 100644 --- a/tests/arm/thecus_dhcp.preseed +++ b/tests/arm/thecus_dhcp.preseed @@ -1,8 +1,8 @@ -op_db_set netcfg/dhcp_failed note -op_db_set netcfg/dhcp_options select Configure network manually -op_db_set netcfg/get_ipaddress string 192.168.1.100 -op_db_set netcfg/get_netmask string 255.255.255.0 -op_db_set netcfg/get_gateway string 192.168.1.1 -op_db_set netcfg/get_nameservers string 192.168.1.1 -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/use_dhcp boolean true +op_db_set netcfg/dhcp_failed +op_db_set netcfg/dhcp_options Configure network manually +op_db_set netcfg/get_ipaddress 192.168.1.100 +op_db_set netcfg/get_netmask 255.255.255.0 +op_db_set netcfg/get_gateway 192.168.1.1 +op_db_set netcfg/get_nameservers 192.168.1.1 +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/use_dhcp true diff --git a/tests/arm/thecus_static_not_default.preseed b/tests/arm/thecus_static_not_default.preseed index 1cf1508..cc8bc6e 100644 --- a/tests/arm/thecus_static_not_default.preseed +++ b/tests/arm/thecus_static_not_default.preseed @@ -1,9 +1,9 @@ -op_db_set netcfg/choose_interface select eth0 -op_db_set netcfg/get_ipaddress string 192.168.0.100 -op_db_set netcfg/get_netmask string 255.255.0.0 -op_db_set netcfg/get_gateway string 192.168.0.1 -op_db_set netcfg/get_nameservers string 192.168.0.1 192.168.0.2 -op_db_set netcfg/confirm_static boolean true -op_db_set netcfg/disable_dhcp boolean true -op_db_set netcfg/get_hostname string n2100 -op_db_set netcfg/get_domain string daka.thg.se +op_db_set netcfg/choose_interface eth0 +op_db_set netcfg/get_ipaddress 192.168.0.100 +op_db_set netcfg/get_netmask 255.255.0.0 +op_db_set netcfg/get_gateway 192.168.0.1 +op_db_set netcfg/get_nameservers 192.168.0.1 192.168.0.2 +op_db_set netcfg/confirm_static true +op_db_set netcfg/disable_dhcp true +op_db_set netcfg/get_hostname n2100 +op_db_set netcfg/get_domain daka.thg.se -- 1.7.5.4 -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1313532321-13642-7-git-send-email-l...@debian.org