瀏覽代碼

Fix wrong kernel flag

Gabriel Adrian Samfira 6 年之前
父節點
當前提交
6b6ee08053
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 2 2
      coriolis/osmorphing/debian.py
  2. 0 1
      coriolis/osmorphing/redhat.py

+ 2 - 2
coriolis/osmorphing/debian.py

@@ -44,13 +44,13 @@ class BaseDebianMorphingTools(base.BaseLinuxOSMorphingTools):
         cfg = utils.Grub2ConfigEditor(contents)
         cfg = utils.Grub2ConfigEditor(contents)
         cfg.append_to_option(
         cfg.append_to_option(
             "GRUB_CMDLINE_LINUX_DEFAULT",
             "GRUB_CMDLINE_LINUX_DEFAULT",
-            {"opt_type": "key_val", "opt_key": "net.ifaces", "opt_val": 0})
+            {"opt_type": "key_val", "opt_key": "net.ifnames", "opt_val": 0})
         cfg.append_to_option(
         cfg.append_to_option(
             "GRUB_CMDLINE_LINUX_DEFAULT",
             "GRUB_CMDLINE_LINUX_DEFAULT",
             {"opt_type": "key_val", "opt_key": "biosdevname", "opt_val": 0})
             {"opt_type": "key_val", "opt_key": "biosdevname", "opt_val": 0})
         cfg.append_to_option(
         cfg.append_to_option(
             "GRUB_CMDLINE_LINUX",
             "GRUB_CMDLINE_LINUX",
-            {"opt_type": "key_val", "opt_key": "net.ifaces", "opt_val": 0})
+            {"opt_type": "key_val", "opt_key": "net.ifnames", "opt_val": 0})
         cfg.append_to_option(
         cfg.append_to_option(
             "GRUB_CMDLINE_LINUX",
             "GRUB_CMDLINE_LINUX",
             {"opt_type": "key_val", "opt_key": "biosdevname", "opt_val": 0})
             {"opt_type": "key_val", "opt_key": "biosdevname", "opt_val": 0})

+ 0 - 1
coriolis/osmorphing/redhat.py

@@ -146,7 +146,6 @@ class BaseRedHatMorphingTools(base.BaseLinuxOSMorphingTools):
             self.disable_predictable_nic_names()
             self.disable_predictable_nic_names()
             self._write_nic_configs(nics_info)
             self._write_nic_configs(nics_info)
             return
             return
-            # self._set_dhcp_net_config(ifcfgs_ethernet)
 
 
         ifcfgs_ethernet = self._get_ifcfgs_by_type("Ethernet")
         ifcfgs_ethernet = self._get_ifcfgs_by_type("Ethernet")
         mac_addresses = [ni.get("mac_address") for ni in nics_info]
         mac_addresses = [ni.get("mac_address") for ni in nics_info]