Merge pull request #27 from FyraLabs/revert-19-w/dnf5-default

Revert "feat: switch to dnf5 as default backend"

.github/workflows/build-test.yml

@@ -42,7 +42,7 @@ jobs:
   image-arm:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
       # Pass /dev from host to container
       # Very hacky, but it works
       # Microsoft/Github, if you're reading this,

.github/workflows/release.yml

@@ -48,7 +48,7 @@ jobs:
     runs-on: ${{ matrix.arch == 'aarch64' && 'arm64' || 'ubuntu-latest' }}
 
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/test.yml

@@ -21,7 +21,7 @@ env:
 jobs:
   check:
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
     name: Check
     runs-on: ubuntu-latest
     steps:
@@ -48,7 +48,7 @@ jobs:
   clippy:
     name: Clippy
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -76,7 +76,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
 
     steps:
       - uses: actions/checkout@v4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/terrapkg/builder:f40
+FROM ghcr.io/terrapkg/builder:f38
 
 RUN dnf install -y \
     xorriso \

src/builder.rs

@@ -272,7 +272,7 @@ pub trait RootBuilder {
 }
 
 fn _default_dnf() -> String {
-	String::from("dnf5")
+	String::from("dnf")
 }
 
 #[derive(Deserialize, Debug, Clone, Serialize, Default)]
@@ -348,15 +348,10 @@ impl RootBuilder for DnfRootBuilder {
 		options.append(&mut exclude.iter().map(|p| format!("--exclude={p}")).collect());
 
 		info!("Initializing system with dnf");
-		let res = crate::chroot_run_cmd!(&chroot,
+		crate::chroot_run_cmd!(&chroot,
 			$dnf install -y --releasever=$releasever --installroot=$chroot $[packages] $[options] 2>&1;
 			$dnf clean all --installroot=$chroot;
-		);
-
-		if let Err(e) = res {
-			tracing::error!("{} failed with error: {e:?}", self.exec);
-			info!("Katsu will continue the build process.");
-		}
+		)?;
 
 		info!("Setting up users");
 

tests/katsudon-arm.yaml

@@ -47,15 +47,16 @@ packages:
   - shim-aa64
   - shim-unsigned-aarch64
 
+
 disk:
   bootloader: true
   root_format: ext4
   disk_size: 8G
 
 sys:
-  releasever: 40
+  releasever: 38
   rootpw: ultramarine
 
 script:
   init: init.sh
-  postinst: postinst.sh
+  postinst: postinst.sh

tests/katsudon-test.yaml

@@ -31,7 +31,7 @@ packages:
   - polkit
 
 sys:
-  releasever: 40
+  releasever: 38
   rootpw: ultramarine
 
 script:

tests/ng/katsu-arm.yaml

@@ -29,4 +29,4 @@ disk:
 
 dnf:
   arch: aarch64
-  releasever: 40
+  releasever: 39

tests/ng/katsu-iso-limine.yaml

@@ -10,7 +10,7 @@ kernel_cmdline: "quiet rhgb"
 bootloader: limine
 
 dnf:
-  releasever: 40
+  releasever: 39
   options:
     - --setopt=keepcache=True
     - --nogpgcheck

tests/ng/katsu-iso.yaml

@@ -10,7 +10,7 @@ kernel_cmdline: "quiet rhgb"
 bootloader: grub
 
 dnf:
-  releasever: 40
+  releasever: 39
   options:
     - --setopt=keepcache=True
     - --nogpgcheck

tests/ng/katsu-script-test.yaml

@@ -7,6 +7,6 @@ dnf:
   options:
     - --nogpgcheck
   repodir: modules/repodir/
-  releasever: 40
+  releasever: 39
   packages:
     - busybox

tests/ng/katsu.yaml

@@ -34,5 +34,5 @@ disk:
       filesystem: ext4
       mountpoint: /
 dnf:
-  exec: dnf5
+  dnf5: true
   releasever: 39

tests/ng/modules/base.yaml

@@ -30,8 +30,6 @@ dnf:
     - --setopt=cachedir=/var/cache/dnf
     - --nogpgcheck
     - --setopt=keepcache=True
-    - --setopt=tsflags=
-    - --setopt=max_parallel_downloads=20
   exclude:
     - fedora-release*
     - generic-release*