fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 03:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: pass boot-id to nm_utils_stable_id_parse()

Browse source 
For testing purpose, it's bad to let nm_utils_stable_id_parse()
directly access nm_utils_get_boot_id_str(). Instead, the function
should have no side-effects.

Since the boot-id is anyway cached, accessing it is cheap. Even
if it likely won't be needed.

(cherry picked from commit c51e63feb6)
This commit is contained in:
Thomas Haller 2018-11-02 12:39:02 +01:00
parent 0c1ee8c68e
commit 10e280686e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/nm-device.c
View file

@ -1281,7 +1281,7 @@ _get_stable_id (NMDevice *self,
stable_type = nm_utils_stable_id_parse (stable_id,
nm_device_get_ip_iface (self),
NULL,
nm_utils_get_boot_id_str (),
uuid,
&generated);

2
src/nm-core-utils.c
View file

@ -3165,7 +3165,7 @@ nm_utils_stable_id_parse (const char *stable_id,
if (CHECK_PREFIX ("${CONNECTION}"))
_stable_id_append (str, uuid);
else if (CHECK_PREFIX ("${BOOT}"))
_stable_id_append (str, bootid ?: nm_utils_get_boot_id_str ());
_stable_id_append (str, bootid);
else if (CHECK_PREFIX ("${DEVICE}"))
_stable_id_append (str, deviceid);
else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) {