[cmdline] Make "dhcp" command a synonym for "ifconf"

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/hci/commands/dhcp_cmd.c b/src/hci/commands/dhcp_cmd.c
index 1b7df7650edeb686dba9343bfe650dd5ac2d4dcf..feeb55ee525dea16e851cbb4fc04f5e4f592f715 100644 (file)
--- a/src/hci/commands/dhcp_cmd.c
+++ b/src/hci/commands/dhcp_cmd.c
@@ -41,53 +41,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 
-/** "dhcp" options */
-struct dhcp_options {};
-
-/** "dhcp" option list */
-static struct option_descriptor dhcp_opts[] = {};
-
-/**
- * Execute "dhcp" command for a network device
- *
- * @v netdev           Network device
- * @v opts             Command options
- * @ret rc             Return status code
- */
-static int dhcp_payload ( struct net_device *netdev,
-                         struct dhcp_options *opts __unused ) {
-       int rc;
-
-       if ( ( rc = dhcp ( netdev ) ) != 0 ) {
-               printf ( "Could not configure %s: %s\n",
-                        netdev->name, strerror ( rc ) );
-
-               /* Close device on failure, to avoid memory exhaustion */
-               netdev_close ( netdev );
-
-               return rc;
-       }
-
-       return 0;
-}
-
-/** "dhcp" command descriptor */
-static struct ifcommon_command_descriptor dhcp_cmd =
-       IFCOMMON_COMMAND_DESC ( struct dhcp_options, dhcp_opts,
-                               0, MAX_ARGUMENTS, "[<interface>...]",
-                               dhcp_payload, 1 );
-
-/**
- * The "dhcp" command
- *
- * @v argc             Argument count
- * @v argv             Argument list
- * @ret rc             Return status code
- */
-static int dhcp_exec ( int argc, char **argv ) {
-       return ifcommon_exec ( argc, argv, &dhcp_cmd );
-}
-
 /** "pxebs" options */
 struct pxebs_options {};
 
@@ -138,7 +91,7 @@ static int pxebs_exec ( int argc, char **argv ) {
 struct command dhcp_commands[] __command = {
        {
                .name = "dhcp",
-               .exec = dhcp_exec,
+               .exec = ifconf_exec, /* synonym for "ifconf" */
        },
        {
                .name = "pxebs",

diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c
index 2fd56ce5859237ebd6d51bec584824160dbc8e8a..f3d00ca387e465e77ac6631688dd3c0be3e839ad 100644 (file)
--- a/src/hci/commands/ifmgmt_cmd.c
+++ b/src/hci/commands/ifmgmt_cmd.c
@@ -238,7 +238,7 @@ static struct ifcommon_command_descriptor ifconf_cmd =
  * @v argv             Argument list
  * @ret rc             Return status code
  */
-static int ifconf_exec ( int argc, char **argv ) {
+int ifconf_exec ( int argc, char **argv ) {
        return ifcommon_exec ( argc, argv, &ifconf_cmd );
 }
 

diff --git a/src/include/hci/ifmgmt_cmd.h b/src/include/hci/ifmgmt_cmd.h
index 2fa8ee527b3271253ed530f174b0c04de2ea0ef3..913b911d8daf619fff8ba5829cdd7509bf6c2e5a 100644 (file)
--- a/src/include/hci/ifmgmt_cmd.h
+++ b/src/include/hci/ifmgmt_cmd.h
@@ -67,5 +67,6 @@ struct ifcommon_command_descriptor {
 
 extern int ifcommon_exec (  int argc, char **argv,
                            struct ifcommon_command_descriptor *cmd );
+extern int ifconf_exec ( int argc, char **argv );
 
 #endif /* _IFMGMT_CMD_H */