about summary refs log tree commit diff
path: root/src/initrd/nmi-cmdline-reader.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-10-24 21:02:52 +0200
committerMichael Biebl <biebl@debian.org>2018-10-24 21:02:52 +0200
commitf87c30ac3b55627a166953aec4de552f5a8c5a53 (patch)
tree1eb82dba7af28b0504403e2aacaeaf927d14065c /src/initrd/nmi-cmdline-reader.c
parentbf9fe831a32fc90b956ee777b629adaf6df49d65 (diff)
parent3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff)
Update upstream source from tag 'upstream/1.14.4'
Update to upstream version '1.14.4'
with Debian dir 3e8398be8782c0495d64cae17094a6b9e5e62907
Diffstat (limited to 'src/initrd/nmi-cmdline-reader.c')
-rw-r--r--src/initrd/nmi-cmdline-reader.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index 2cef534e..e3b1bb63 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -138,9 +138,17 @@ _base_setting_set (NMConnection *connection, const char *property, const char *v
 
 	setting = nm_connection_get_setting_by_name (connection, type_name);
 
-	if (G_IS_PARAM_SPEC_UINT (spec))
-		g_object_set (setting, property, g_ascii_strtoull (value, NULL, 10), NULL);
-	else if (G_IS_PARAM_SPEC_STRING (spec))
+	if (G_IS_PARAM_SPEC_UINT (spec)) {
+		guint v;
+
+		v =  _nm_utils_ascii_str_to_int64 (value, 10, 0, G_MAXUINT, 0);
+		if (   errno
+		    || !nm_g_object_set_property_uint (G_OBJECT (setting), property, v, NULL)) {
+			_LOGW (LOGD_CORE,
+			       "Could not set property '%s.%s' to '%s'",
+			       type_name, property, value);
+		}
+	} else if (G_IS_PARAM_SPEC_STRING (spec))
 		g_object_set (setting, property, value, NULL);
 	else
 		_LOGW (LOGD_CORE, "Don't know how to set '%s' of %s\n", property, type_name);