Browse Source

Allow backup from ASK_OPTIONS to GET_INTERFACE

r20746
tags/1.02
Thomas Hood 17 years ago
parent
commit
24af64bd46
3 changed files with 14 additions and 4 deletions
  1. +5
    -0
      debian/changelog
  2. +2
    -2
      dhcp.c
  3. +7
    -2
      netcfg.c

+ 5
- 0
debian/changelog View File

@@ -9,6 +9,11 @@ netcfg (1.02) UNRELEASED; urgency=low
(Closes: #269081, #269236)
- Code consolidation - don't replicate the code that writes resolv.conf
twice.
* Thomas Hood
- Change function of backup button from netcfg/dhcp_options so that
instead of causing an exit from netcfg it backs up to the
choose-interface question (if there is more than one interface)
(Closes: #269081)

-- Joshua Kwan <joshk@triplehelix.org> Tue, 31 Aug 2004 21:52:12 -0700



+ 2
- 2
dhcp.c View File

@@ -427,7 +427,7 @@ int netcfg_activate_dhcp (struct debconfclient *client)
{
case GO_BACK:
kill_dhcp_client();
exit(10); /* XXX */
return 10;
case REPLY_RETRY_WITH_HOSTNAME:
state = DHCP_HOSTNAME;
break;
@@ -536,7 +536,7 @@ int netcfg_activate_dhcp (struct debconfclient *client)
struct in_addr null_ipaddress;
null_ipaddress.s_addr = 0;
netcfg_write_common(null_ipaddress, hostname, NULL);
exit(0);
return 0;
}
break;
}


+ 7
- 2
netcfg.c View File

@@ -131,8 +131,13 @@ int main(int argc, char *argv[])
case 0:
state = QUIT;
break;
case 30:
state = BACKUP;
case 10:
/*
* It doesn't make sense to go back to GET_METHOD because
* the user has already been asked whether he wants to
* try an alternate method.
*/
state = (num_interfaces == 1) ? BACKUP : GET_INTERFACE;
break;
case 15:
state = GET_STATIC;


Loading…
Cancel
Save