cobbler · SchoolGuy · Apr 25, 2022 · Apr 22, 2022 · Apr 22, 2022 · Apr 22, 2022
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, release* ]
+    branches: [ main, release* ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '36 22 * * 3'
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,15 +2,9 @@ name: Linting
 
 on:
   push:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
   pull_request:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
 
 jobs:
   lint_docs:

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -2,15 +2,9 @@ name: Building Cobbler packages
 
 on:
   push:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
   pull_request:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
 
 jobs:
   build-centos8-rpms:

diff --git a/.github/workflows/release_master.yml b/.github/workflows/release_master.yml
@@ -3,7 +3,7 @@ name: Publish Python distributions to TestPyPI
 on:
   push:
     branches:
-      - master
+      - main
 
 env:
   DATAPATH: "/usr/share/cobbler"

diff --git a/.github/workflows/system_testing.yml b/.github/workflows/system_testing.yml
@@ -1,9 +1,10 @@
 name: System testing
 
 on:
+  push:
+    branches: [ main, release* ]
   pull_request:
-    branches:
-      - master
+    branches: [ main, release* ]
 
 jobs:
   run_system_test:

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -2,15 +2,9 @@ name: Testing Cobbler
 
 on:
   push:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
   pull_request:
-    branches:
-      - master
-      - release30
-      - release32
+    branches: [ main, release* ]
 
 jobs:
   run_tests:

diff --git a/SECURITY.md b/SECURITY.md
@@ -2,18 +2,19 @@
 
 ## Supported Versions
 
-| Version   | Supported                |
-| --------- | ------------------------ |
-| 4.0.X     | Next API breaking Release |
-| 3.3.x     | Current Version: 3.3.2   |
-| 3.2.x     | Security only            |
-| 3.1.x     | EOL                      |
-| 3.0.x     | EOL                      |
-| 2.8.x     | EOL                      |
-| 2.6.x     | EOL                      |
-| 2.4.x     | EOL                      |
-| 2.2.x     | EOL                      |
-| < 2.x.x   | EOL                      |
+| Version | Supported                 |
+|---------|---------------------------|
+| 4.0.X   | Next API breaking Release |
+| 3.4.x   | Current Version: 3.4.0    |
+| 3.3.x   | Security only             |
+| 3.2.x   | EOL                       |
+| 3.1.x   | EOL                       |
+| 3.0.x   | EOL                       |
+| 2.8.x   | EOL                       |
+| 2.6.x   | EOL                       |
+| 2.4.x   | EOL                       |
+| 2.2.x   | EOL                       |
+| < 2.x.x | EOL                       |
 
 Due to the amount of maintainers we have, we can only support the most current version. Old versions won't be actively
 maintained.

diff --git a/cobbler.spec b/cobbler.spec
@@ -151,7 +151,7 @@
 %endif
 
 Name:           cobbler
-Version:        3.3.2
+Version:        3.3.3
 Release:        1%{?dist}
 Summary:        Boot server configurator
 URL:            https://cobbler.github.io/

diff --git a/cobbler/actions/buildiso/netboot.py b/cobbler/actions/buildiso/netboot.py
@@ -377,7 +377,7 @@ def generate_profile(self, distro_breed: str) -> str:
         :param distro_breed: The name of the distribution breed.
         :return: The generated append line.
         """
-        self.append_line = " append initrd=%s.img" % self.distro_name
+        self.append_line = "  APPEND initrd=%s.img" % self.distro_name
         if distro_breed == "suse":
             if self.data.get("proxy", "") != "":
                 self.append_line += " proxy=%s" % self.data["proxy"]

diff --git a/cobbler/cli.py b/cobbler/cli.py
@@ -320,7 +320,7 @@
     ["virt_cpus", 1, '<<inherit>>', "Virt CPUs", True, "integer", 0, "int"],
     ["virt_disk_driver", "SETTINGS:default_virt_disk_driver", '<<inherit>>', "Virt Disk Driver Type", True,
      "The on-disk format for the virtualization disk", [e.value for e in enums.VirtDiskDrivers], "str"],
-    ["virt_file_size", "SETTINGS:default_virt_file_size", '<<inherit>>', "Virt File Size(GB)", True, "", 0, "int"],
+    ["virt_file_size", "SETTINGS:default_virt_file_size", '<<inherit>>', "Virt File Size(GB)", True, "", 0.0, "float"],
     ["virt_path", "", '<<inherit>>', "Virt Path", True, "Ex: /directory OR VolGroup00", 0, "str"],
     ["virt_ram", "SETTINGS:default_virt_ram", '<<inherit>>', "Virt RAM (MB)", True, "", 0, "int"],
     ["virt_type", "SETTINGS:default_virt_type", '<<inherit>>', "Virt Type", True, "Virtualization technology to use",
@@ -422,7 +422,7 @@
     ["virt_cpus", "<<inherit>>", 0, "Virt CPUs", True, "", 0, "int"],
     ["virt_disk_driver", "<<inherit>>", 0, "Virt Disk Driver Type", True,
      "The on-disk format for the virtualization disk", [e.value for e in enums.VirtDiskDrivers], "str"],
-    ["virt_file_size", "<<inherit>>", 0, "Virt File Size(GB)", True, "", 0, "float"],
+    ["virt_file_size", "<<inherit>>", 0.0, "Virt File Size(GB)", True, "", 0.0, "float"],
     ["virt_path", "<<inherit>>", 0, "Virt Path", True, "Ex: /directory or VolGroup00", 0, "str"],
     ["virt_pxe_boot", 0, 0, "Virt PXE Boot", True, "Use PXE to build this VM?", 0, "bool"],
     ["virt_ram", "<<inherit>>", 0, "Virt RAM (MB)", True, "", 0, "int"],

diff --git a/cobbler/items/image.py b/cobbler/items/image.py
@@ -363,7 +363,7 @@ def virt_file_size(self) -> float:
         :getter: The size of the image(s) in GB.
         :setter: The float with the new size in GB.
         """
-        return self._virt_file_size
+        return self._resolve("virt_file_size")
 
     @virt_file_size.setter
     def virt_file_size(self, num: float):

diff --git a/cobbler/items/item.py b/cobbler/items/item.py
@@ -183,7 +183,7 @@ def _resolve(self, property_name: str) -> Any:
                     % (type(self), self.name, property_name)
                 )
 
-            return attribute_value
+        return attribute_value
 
     def _resolve_enum(
             self, property_name: str, enum_type: Type[enums.ConvertableEnum]

diff --git a/cobbler/items/profile.py b/cobbler/items/profile.py
@@ -539,7 +539,7 @@ def virt_cpus(self, num: Union[int, str]):
         self._virt_cpus = validate.validate_virt_cpus(num)
 
     @property
-    def virt_file_size(self) -> int:
+    def virt_file_size(self) -> float:
         r"""
         The size of the image and thus the usable size for the guest.
 

diff --git a/cobbler/settings/__init__.py b/cobbler/settings/__init__.py
@@ -89,7 +89,7 @@ def __init__(self):
         self.default_template_type = "cheetah"
         self.default_virt_bridge = "xenbr0"
         self.default_virt_disk_driver = "raw"
-        self.default_virt_file_size = 5
+        self.default_virt_file_size = 5.0
         self.default_virt_ram = 512
         self.default_virt_type = "auto"
         self.enable_ipxe = False
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Publish Python distributions to TestPyPI @@
     on:
       push:
         branches:
-          - master
+          - main
     env:
       DATAPATH: "/usr/share/cobbler"
@@ Expand Down @@