summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nm-initrd-generator/nmi-cmdline-reader.c11
-rw-r--r--src/nm-initrd-generator/tests/test-cmdline-reader.c45
2 files changed, 20 insertions, 36 deletions
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index 3f4e304345..ced1eeddf2 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -1183,7 +1183,7 @@ reader_parse_ethtool(Reader *reader, char *argument)
interface = get_word(&argument, ':');
if (!interface) {
- _LOGW(LOGD_CORE, "Impossible to set rd.ethtool options: invalid format");
+ _LOGW(LOGD_CORE, "rd.ethtool: interface unspecified. Ignore");
return;
}
@@ -1194,15 +1194,14 @@ reader_parse_ethtool(Reader *reader, char *argument)
if (autoneg_str) {
autoneg = _nm_utils_ascii_str_to_bool(autoneg_str, -1);
if (autoneg == -1)
- _LOGW(LOGD_CORE,
- "Invalid value for rd.ethtool.autoneg, rd.ethtool.autoneg was not set");
+ _LOGW(LOGD_CORE, "rd.ethtool: autoneg invalid. Must be boolean or empty");
}
speed = 0;
if (speed_str) {
speed = _nm_utils_ascii_str_to_int64(speed_str, 10, 0, G_MAXUINT32, 0);
if (errno)
- _LOGW(LOGD_CORE, "Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ _LOGW(LOGD_CORE, "rd.ethtool: speed invalid. Must be an integer or empty");
}
if (speed == 0 && autoneg == FALSE) {
@@ -1227,9 +1226,7 @@ reader_parse_ethtool(Reader *reader, char *argument)
}
if (*argument)
- _LOGW(LOGD_CORE,
- "Invalid extra argument '%s' for rd.ethtool, this value was not set",
- argument);
+ _LOGW(LOGD_CORE, "rd.ethtool: extra argument ignored");
}
static void
diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c
index f13f625b1f..d8bbb5e86b 100644
--- a/src/nm-initrd-generator/tests/test-cmdline-reader.c
+++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c
@@ -2315,14 +2315,14 @@ test_carrier_timeout(void)
static void
test_rd_ethtool(void)
{
- NMTST_EXPECT_NM_WARN("cmdline-reader: Impossible to set rd.ethtool options: invalid format");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: interface unspecified. Ignore");
_ethtool_check_inval("rd.ethtool=");
_ethtool_check("rd.ethtool=eth0", FALSE, 0);
_ethtool_check("rd.ethtool=eth0:", FALSE, 0);
- NMTST_EXPECT_NM_WARN("cmdline-reader: Impossible to set rd.ethtool options: invalid format");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: interface unspecified. Ignore");
_ethtool_check_inval("rd.ethtool=::");
_ethtool_check("rd.ethtool=eth0:on", TRUE, 0);
@@ -2346,61 +2346,48 @@ test_rd_ethtool(void)
"without setting speed");
_ethtool_check("rd.ethtool=eth0:0", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.autoneg, rd.ethtool.autoneg was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: autoneg invalid. Must be boolean or empty");
_ethtool_check("rd.ethtool=eth0:randomstring", FALSE, 0);
_ethtool_check("rd.ethtool=eth0::", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
_ethtool_check("rd.ethtool=eth0::astring", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
_ethtool_check("rd.ethtool=eth0::1000000000000000000000000000000000000", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
_ethtool_check("rd.ethtool=eth0::0.67", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
_ethtool_check("rd.ethtool=eth0::-23", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
_ethtool_check("rd.ethtool=eth0::-23:", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid extra argument ':' for rd.ethtool, this value was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: extra argument ignored");
_ethtool_check("rd.ethtool=eth0::-23::", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid value for rd.ethtool.speed, rd.ethtool.speed was not set");
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid extra argument ':foo' for rd.ethtool, this value was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: speed invalid. Must be an integer or empty");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: extra argument ignored");
_ethtool_check("rd.ethtool=eth0::-23::foo", FALSE, 0);
_ethtool_check("rd.ethtool=eth0:1:10", TRUE, 10);
_ethtool_check("rd.ethtool=eth0::100", FALSE, 100);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid extra argument 'bogus' for rd.ethtool, this value was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: extra argument ignored");
_ethtool_check("rd.ethtool=eth0:::bogus", FALSE, 0);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid extra argument 'bogus' for rd.ethtool, this value was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: extra argument ignored");
_ethtool_check("rd.ethtool=eth0::10:bogus", FALSE, 10);
- NMTST_EXPECT_NM_WARN(
- "cmdline-reader: Invalid extra argument 'bogus' for rd.ethtool, this value was not set");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: extra argument ignored");
_ethtool_check("rd.ethtool=eth0:on:100:bogus", TRUE, 100);
- NMTST_EXPECT_NM_WARN("cmdline-reader: Impossible to set rd.ethtool options: invalid format");
+ NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: interface unspecified. Ignore");
_ethtool_check_inval("rd.ethtool=:::");
NMTST_EXPECT_NM_WARN("cmdline-reader: rd.ethtool: autoneg ignored. Cannot disable autoneg "
View Lorry Controller Status