Validate input for --offloading flag and throw an error when empty

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.util b/src/functions/functions.util
index a326d239225463c832bac1e2b9d8af55a6b326c0..8831d84b3953c0aca5918bbc3840e6e5f4861edd 100644 (file)
--- a/src/functions/functions.util
+++ b/src/functions/functions.util
@@ -266,6 +266,12 @@ enabled() {
        list_match "${!param}" yes on true 1
 }
 
+disabled() {
+       local param="${1}"
+
+       list_match "${!param}" no off false 0
+}
+
 mac_generate() {
        local b="$(random 12)"
 

diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding
index 6248cc15d4adb895bf9d54feffbe91326680f2f8..1a6399e818ad1ad42e9031bcd632e581107e2ca3 100644 (file)
--- a/src/hooks/ports/bonding
+++ b/src/hooks/ports/bonding
@@ -52,8 +52,11 @@ hook_parse_cmdline() {
 
                                if enabled OFFLOADING; then
                                        OFFLOADING="on"
-                               else
+                               elif disabled OFFLOADING; then
                                        OFFLOADING="off"
+                               else
+                                       error "Invalid value for offloading: ${OFFLOADING}"
+                                       return ${EXIT_ERROR}
                                fi
                                ;;
                        +*)

diff --git a/src/hooks/ports/ethernet b/src/hooks/ports/ethernet
index b782e52fe2f8ff2cff11642be7e2ddab29a6a462..765d34db3e7cd5ded6408042b8921f17ff55aa9e 100644 (file)
--- a/src/hooks/ports/ethernet
+++ b/src/hooks/ports/ethernet
@@ -83,8 +83,11 @@ hook_parse_cmdline() {
 
                                if enabled OFFLOADING; then
                                        OFFLOADING="on"
-                               else
+                               elif disabled OFFLOADING; then
                                        OFFLOADING="off"
+                               else
+                                       error "Invalid value for offloading: ${OFFLOADING}"
+                                       return ${EXIT_ERROR}
                                fi
                                ;;