network July 2018

network@lists.ipfire.org

3 participants
3 discussions

[PATCH] Fix hook for static address configuration.
by Stefan Schantl 15 Sep '18

15 Sep '18

Add the required hook_new function and "id" information which have been introduced in earlier commits to make this hook work again. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- src/hooks/configs/static | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/hooks/configs/static b/src/hooks/configs/static index 91bba8a..37f3d32 100644 --- a/src/hooks/configs/static +++ b/src/hooks/configs/static @@ -52,6 +52,8 @@ hook_check_config_settings() { hook_parse_cmdline() { local protocol + local id="${1}" + shift while [ $# -gt 0 ]; do case "${1}" in @@ -153,12 +155,34 @@ hook_parse_cmdline() { fi # Check any conflicts - if zone_config_check_same_setting "${zone}" "static" "ADDRESS" "${ADDRESS}"; then + if zone_config_check_same_setting "${zone}" "static" "${id}" "ADDRESS" "${ADDRESS}"; then error "A static configuration with the same address is already configured" return ${EXIT_CONF_ERROR} fi } +hook_new() { + local zone="${1}" + shift + + if zone_config_hook_is_configured ${zone} "static"; then + log ERROR "You can configure the static hook only once for a zone" + return ${EXIT_ERROR} + fi + + local id=$(zone_config_get_new_id ${zone}) + log DEBUG "ID for the config is: ${id}" + + if ! hook_parse_cmdline "${id}" "$@"; then + # Return an error if the parsing of the cmd line fails + return ${EXIT_ERROR} + fi + + zone_config_settings_write "${zone}" "${HOOK}" "${id}" + + exit ${EXIT_OK} +} + hook_up() { local zone="${1}" local config="${2}" -- 2.17.1

3 3

[PATCH 1/4] Add recipe to reset network configuration
by Jonatan Schlag 28 Jul '18

28 Jul '18

We use --force here to avoid the y/n question. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 7 +++++-- test/nitsi/include/network-reset | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/nitsi/include/network-reset diff --git a/Makefile.am b/Makefile.am index e56d0fb..2574a2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ NITSI_INCLUDE_RECIPES = \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/network-reset EXTRA_DIST += \ test/nitsi/include/make-install.in + test/nitsi/include/network-reset CLEANFILES += \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + NITSI_TESTS = \ test/nitsi/test/hello-world \ diff --git a/test/nitsi/include/network-reset b/test/nitsi/include/network-reset new file mode 100644 index 0000000..d82e2b1 --- /dev/null +++ b/test/nitsi/include/network-reset @@ -0,0 +1 @@ +all: network reset --force -- 2.11.0

1 3

[PATCH 1/3] Add make install recipe for alice only
by Jonatan Schlag 24 Jul '18

24 Jul '18

It saves us much time when we install the network only on alice, when we are using alice only. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- Makefile.am | 9 ++++++--- test/nitsi/include/alice_make-install.in | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 test/nitsi/include/alice_make-install.in diff --git a/Makefile.am b/Makefile.am index e56d0fb..bde49ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -586,13 +586,16 @@ VIRTUAL_ENVIRONMENT_IMAGES_DOWNLOAD_URL = \ https://people.ipfire.org/~jschlag/nitsi-ipfire/virtual-environment/basic/ NITSI_INCLUDE_RECIPES = \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install EXTRA_DIST += \ - test/nitsi/include/make-install.in + test/nitsi/include/make-install.in \ + test/nitsi/include/alice_make-install.in CLEANFILES += \ - test/nitsi/include/make-install + test/nitsi/include/make-install \ + test/nitsi/include/alice_make-install NITSI_TESTS = \ test/nitsi/test/hello-world \ diff --git a/test/nitsi/include/alice_make-install.in b/test/nitsi/include/alice_make-install.in new file mode 100644 index 0000000..6718510 --- /dev/null +++ b/test/nitsi/include/alice_make-install.in @@ -0,0 +1,4 @@ +alice: tar xvfa @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz && cd @PACKAGE_NAME@-@PACKAGE_VERSION@ +alice: ./configure --prefix=/usr && make -j2 +alice: make +alice: make install -- 2.11.0

1 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

network July 2018