function cli_config() {
if cli_help_requested $@; then
- cli_usage root-config
+ cli_show_man network-config
exit ${EXIT_OK}
fi
if [ -n "${1}" ]; then
- network_config_set $@
+ config_set $@
+ network_config_write
else
network_config_print
fi
device_show ${device}
;;
*)
- cli_usage device
+ cli_show_man network-device
;;
esac
}
function cli_hostname() {
if cli_help_requested $@; then
- cli_usage hostname
+ cli_show_man network
exit ${EXIT_OK}
fi
exit ${EXIT_OK}
}
-function cli_hotplug() {
- if cli_help_requested $@; then
- cli_usage root-hotplug
- exit ${EXIT_OK}
- fi
-
- local command=${1}
- shift
-
- case "${command}" in
- device)
- device_hotplug $@
- exit $?
- ;;
- *)
- cli_usage root-hotplug
- exit ${EXIT_OK}
- ;;
- esac
-}
-
function cli_port() {
if cli_help_requested $@; then
- cli_usage root-port
+ cli_show_man network-port
exit ${EXIT_OK}
fi
function cli_zone() {
if cli_help_requested $@; then
- cli_usage root-zone
+ cli_show_man network-zone
exit ${EXIT_OK}
fi
;;
*)
error "Unrecognized argument: ${action}"
- cli_usage root-zone-subcommands
+ cli_show_man network-zone
exit ${EXIT_ERROR}
;;
esac
shift
case "${action}" in
- create|remove)
+ create)
zone_${action} $@
;;
+ remove)
+ cli_zone_remove $@
+ ;;
""|*)
if [ -n "${action}" ]; then
error "Unrecognized argument: '${action}'"
echo
fi
- cli_usage root-zone
+ cli_show_man network-zone
exit ${EXIT_ERROR}
;;
esac
fi
}
+# Removes a zone either immediately, if it is currently down,
+# or adds a tag that the removal will be done when the zone
+# is brought down the next time.
+function cli_zone_remove() {
+ if cli_help_requested $@; then
+ cli_show_man network-zone
+ exit ${EXIT_OK}
+ fi
+
+ local zone=${1}
+ assert zone_exists ${zone}
+
+ if zone_is_up ${zone}; then
+ echo "Zone '${zone}' is up and will be removed when it goes down the next time."
+ zone_remove ${zone}
+ else
+ echo "Removing zone '${zone}' now..."
+ zone_remove_now ${zone}
+ fi
+
+ exit ${EXIT_OK}
+}
+
function cli_start() {
if cli_help_requested $@; then
- cli_usage root-start
+ cli_show_man network
exit ${EXIT_OK}
fi
local zone
for zone in ${zones}; do
- zone_up ${zone}
+ zone_start ${zone} &
done
+
+ wait # until everything is settled
}
function cli_stop() {
if cli_help_requested $@; then
- cli_usage root-stop
+ cli_show_man network
exit ${EXIT_OK}
fi
local zone
for zone in ${zones}; do
- zone_down ${zone}
+ zone_stop ${zone} &
done
+
+ wait # until everything is settled
}
function cli_restart() {
if cli_help_requested $@; then
- cli_usage root-restart
+ cli_show_man network
exit ${EXIT_OK}
fi
function cli_status() {
if cli_help_requested $@; then
- cli_usage root-status
+ cli_show_man network
exit ${EXIT_OK}
fi
+ # When dumping status information, the debug
+ # mode clutters the console which is not what we want.
+ # Logging on the console is disabled for a short time.
+ local log_disable_stdout=${LOG_DISABLE_STDOUT}
+ LOG_DISABLE_STDOUT="true"
+
local zones=$(zones_get $@)
local zone
for zone in ${zones}; do
zone_status ${zone}
done
+
+ # Reset logging.
+ LOG_DISABLE_STDOUT=${log_disable_stdout}
}
function cli_reset() {
if cli_help_requested $@; then
- cli_usage root-reset
+ cli_show_man network
exit ${EXIT_OK}
fi
return ${EXIT_ERROR}
}
-function cli_usage() {
- local what=${1}
-
- case "${what}" in
- root)
- echo "${0}: [command] <options ...>"
- echo
- echo " start - ..."
- echo " stop - ..."
- echo " restart - ..."
- echo " status - ..."
- echo
- echo " config - ..."
- echo
- echo " device - ..."
- echo " zone - ..."
- echo
- ;;
- root-config)
- echo "${0}: ${what#root-} [KEY=VAL, ...]"
- echo
- echo " This command allows setting of global configuration parameters."
- echo
- echo " If no additional arguments are passed it will list the current configuration."
- echo
- echo " You can overwrite the settings like the following:"
- echo
- echo " ${0} ${what#root-} DEBUG=1 ..."
- echo
- ;;
- root-reset)
- echo "${0}: ${what#root-} [--force | -f]"
- echo
- echo " This command resets the network configuration."
- echo
- echo " Will delete all zones and ports."
- echo
- echo -e " ${COLOUR_RED}USE WITH CAUTION!${COLOUR_NORMAL}"
- echo
- ;;
- root-start|root-stop|root-restart)
- echo "${0}: ${what#root-} [--local-only|--remote-only|--all|<zone>...]"
- echo
- echo " This commands ${what#root-}s all zones by default."
- echo " One can pass several parameters to only process a subset of all"
- echo " available zones:"
- echo
- echo -e " ${COLOUR_BOLD}--local-only${COLOUR_NORMAL}"
- echo " Process all local zones which includes every zone without red."
- echo
- echo -e " ${COLOUR_BOLD}--remote-only${COLOUR_NORMAL}"
- echo " Process all remote zones which means only the red ones."
- echo
- echo -e " ${COLOUR_BOLD}--all${COLOUR_NORMAL}"
- echo " Process all zones. This is the default parameter."
- echo
- echo " Additionally, you can pass one or more zone names which will"
- echo " be processed."
- echo
- ;;
- root-status)
- echo "${0}: ${what#root-} [--local-only|--remote-only|--all|<zone>...]"
- echo
- echo " This commands shows status information of all zones by default."
- echo " One can pass several parameters to only process a subset of all"
- echo " available zones:"
- echo
- echo -e " ${COLOUR_BOLD}--local-only${COLOUR_NORMAL}"
- echo " Process all local zones which includes every zone without red."
- echo
- echo -e " ${COLOUR_BOLD}--remote-only${COLOUR_NORMAL}"
- echo " Process all remote zones which means only the red ones."
- echo
- echo -e " ${COLOUR_BOLD}--all${COLOUR_NORMAL}"
- echo " Process all zones. This is the default parameter."
- echo
- echo " Additionally, you can pass one or more zone names which will"
- echo " be processed."
- echo
- ;;
- root-zone)
- echo "${0}: ${what#root-} <create|remove> <zone> [<type> <options...>]"
- echo
- echo " Create or remove a zone."
- echo
- echo -e " ${COLOUR_BOLD}create <zone> <type> <options>${COLOUR_NORMAL}"
- echo " Create a new zone of type <type> where <zone> is an allowed"
- echo " zone name."
- echo
- echo -e " ${COLOUR_BOLD}remove <zone>${COLOUR_NORMAL}"
- echo " Remove the zone <zone>."
- echo
- echo " You may also edit the configuration of the zones."
- echo
- echo -e " ${COLOUR_BOLD}<zone> ...${COLOUR_NORMAL}"
- echo " Edit the zone <zone>."
- echo
- ;;
- usage)
- echo
- echo " Run '${0} help' to get information how to use this tool."
- echo
- ;;
- *)
- error "No help available for this command '${what}'."
- echo
- ;;
- esac
-
- echo "Network configuration tool. Report all bugs to <http://bugs.ipfire.org>."
-}
-
function cli_status_headline() {
local zone=${1}
}
function cli_get_val() {
- echo "${1##*=}"
+ echo "${@##*=}"
+}
+
+function cli_usage() {
+ local command="$@"
+ local basename="$(basename ${0})"
+
+ if ! isset command; then
+ command="${basename} help"
+ fi
+
+ echo "The given command was not understood by ${basename}." >&2
+ echo "Please run '${command}' for detailed help." >&2
+}
+
+function cli_show_man() {
+ local manpage=${1}
+ assert isset manpage
+
+ if ! binary_exists man; then
+ error "The man package is not installed on this system."
+ error "Please install 'man' in order to view the help."
+ exit ${EXIT_ERROR}
+ fi
+
+ man ${manpage}
}
projects / people / ms / network.git / blobdiff