]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Merge pull request #1302 from DaanDeMeyer/repart-format
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 15 Jan 2023 19:23:48 +0000 (20:23 +0100)
committerGitHub <noreply@github.com>
Sun, 15 Jan 2023 19:23:48 +0000 (20:23 +0100)
Default to the distro preferred filesystem instead of ext4

1  2 
.github/workflows/ci.yml
mkosi/__init__.py
mkosi/distributions/__init__.py
mkosi/distributions/arch.py
mkosi/distributions/centos.py
mkosi/distributions/debian.py
mkosi/distributions/fedora.py
mkosi/distributions/gentoo.py
mkosi/distributions/mageia.py
mkosi/distributions/openmandriva.py
mkosi/distributions/opensuse.py

index 6870b048c6f2a40445d49db810050ddcb9912450,a853fab72896e6fd0b628f92e387a4f9cd8269d6..7f12ff6395b0dd9f5e59a6ee100a265f757c6ddb
@@@ -111,9 -111,10 +111,10 @@@ jobs
            - debian
            - ubuntu
            - fedora
 -          - rocky_epel
 -          - alma_epel
 +          - rocky
 +          - alma
            - gentoo
+           - opensuse
          format:
            - directory
            - tar
Simple merge
index aa87b7185a90c1b9ae1e3319eb51d5b372752c72,6bf41d99b5205de3a053d8a29dd6ef96e82b07dd..3d2e5db365163f6fd6ad18de1ea499bd56aaf7a8
@@@ -23,5 -23,9 +23,9 @@@ class DistributionInstaller
          raise NotImplementedError
  
      @classmethod
 -    def remove_packages(cls, state: "MkosiState", remove: List[str]) -> None:
 +    def remove_packages(cls, state: "MkosiState", remove: list[str]) -> None:
          raise NotImplementedError
+     @classmethod
+     def filesystem(cls) -> str:
+         raise NotImplementedError
index 15e520564ddd168bc4a97ec5beb715a9b927e369,1da7a1a888c1c03d731285e45d00127ad8361962..866f9d2f5525cda619c7149716123040407713c4
@@@ -18,9 -19,13 +18,13 @@@ from mkosi.mounts import mount_api_vf
  
  class ArchInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/pacman/pkg"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "ext4"
      @classmethod
      def install(cls, state: "MkosiState") -> None:
          return install_arch(state)
index bb192481171927f1404047268631112d88b3c6c6,217ff478243456e2a6319b98d0472b58d7e9d9b1..59031912c78290e25f08575ad7048437f3bd0702
@@@ -33,9 -19,13 +33,13 @@@ def move_rpm_db(root: Path) -> None
  
  class CentosInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/yum", "var/cache/dnf"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "xfs"
      @classmethod
      @complete_step("Installing CentOS…")
      def install(cls, state: "MkosiState") -> None:
index 03489523e480b30253a0cff6df02f29a5683f334,fb6cca80ad77e2986346ce48b2aec8605864a96a..bcea213b5ba6eccf4a0bdde325a7c3da7b9d2bb1
@@@ -48,9 -49,13 +48,13 @@@ class DebianInstaller(DistributionInsta
              run(["systemctl", "--root", state.root, "enable", "systemd-resolved"])
  
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/apt/archives"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "ext4"
      @staticmethod
      def kernel_image(name: str, architecture: str) -> Path:
          return Path(f"boot/vmlinuz-{name}")
index f6ac14b099245bbc2e6786316c9188b49a9e6af0,fca0b01078c5ddb3dbd83111f127bad2494edfa3..32049d14ea845f7d2d29494421b3b271d1bb617f
@@@ -33,9 -61,13 +33,13 @@@ FEDORA_KEYS_MAP = 
  
  class FedoraInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/dnf"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "btrfs"
      @classmethod
      def install(cls, state: "MkosiState") -> None:
          return install_fedora(state)
index b2be5648c167cf017bcdf828b4f9d60748f202a8,b5c53dd6ea5abeb61324383ac76411397ad84be1..55911c69d827d6b97e8c7d37a27de9f8fd3db40c
@@@ -393,9 -394,13 +393,13 @@@ class Gentoo
  
  class GentooInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/binpkgs", "var/cache/distfiles"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "ext4"
      @staticmethod
      def kernel_image(name: str, architecture: str) -> Path:
          _, kimg_path = ARCHITECTURES[architecture]
index 0a3dd383e6855afe90ae21fccc8e26ad67961916,019f9ba1b5f9fe76bc1fad4deb611b82e5a4e23e..0449e067ef59f775dc0b73f4530e909992d18e7d
@@@ -9,9 -10,13 +9,13 @@@ from mkosi.distributions.fedora import 
  
  class MageiaInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/dnf"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "ext4"
      @classmethod
      def install(cls, state: "MkosiState") -> None:
          return install_mageia(state)
index 8e0dfe0c49d96f0476250fddba914fe7a265543b,b900622bee1d6cd1a863f68c91e4ead9958c366e..cfb84370c118fbfac60031ff9b7732b28ecbf8fc
@@@ -9,9 -10,13 +9,13 @@@ from mkosi.distributions.fedora import 
  
  class OpenmandrivaInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/dnf"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "ext4"
      @classmethod
      def install(cls, state: "MkosiState") -> None:
          return install_openmandriva(state)
index 3642550a7363578473d9837a8c53f678cff8d920,2353a1966ce31bb042574a7751faafdc5f258e46..65f3620aaacad68b3b415e1b9969876ac173951b
@@@ -17,9 -18,13 +17,13 @@@ from mkosi.mounts import mount_api_vf
  
  class OpensuseInstaller(DistributionInstaller):
      @classmethod
 -    def cache_path(cls) -> List[str]:
 +    def cache_path(cls) -> list[str]:
          return ["var/cache/zypp/packages"]
  
+     @classmethod
+     def filesystem(cls) -> str:
+         return "btrfs"
      @classmethod
      def install(cls, state: "MkosiState") -> None:
          return install_opensuse(state)