fix condition on when net naming is emitted

oamg · Nov 6, 2024 · b82a1cd · b82a1cd
1 parent 8c6abc8
commit b82a1cd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py b/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py
@@ -44,7 +44,10 @@ def is_net_scheme_compatible_with_current_cmdline():
 
 
 def emit_msgs_to_use_net_naming_schemes():
-    if get_env('LEAPP_USE_NET_NAMING_SCHEMES', '0') != '1' and version.get_target_major_version() != '8':
+    is_env_var_set = (get_env('LEAPP_USE_NET_NAMING_SCHEMES', '0') == '1')
+    is_upgrade_8to9 = (version.get_target_major_version() == '9')
+    is_net_naming_enabled_and_permitted = is_env_var_set and is_upgrade_8to9
+    if not is_net_naming_enabled_and_permitted:
         return
 
     # The package should be installed regardless of whether we will modify the cmdline -