Merge branch 'dev' of https://github.com/honjow/chimeraos into dev

3003n · Sep 24, 2023 · af3e0f4 · af3e0f4
2 parents 2dcdb6c + db40073
commit af3e0f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ LABEL contributor="[email protected]"
 COPY rootfs/etc/pacman.conf /etc/pacman.conf
 RUN echo -e "keyserver-options auto-key-retrieve" >> /etc/pacman.d/gnupg/gpg.conf && \
     pacman-key --init && \
-    pacman --noconfirm -Syyuu && \
+    pacman --noconfirm -Syy && \
     pacman --noconfirm -S \
     arch-install-scripts \
     btrfs-progs \

diff --git a/manifest b/manifest
@@ -160,6 +160,7 @@ export PACKAGES="\
 	xf86-video-amdgpu \
 	xorg-server \
 	xfsprogs \
+	zram-generator \
 	zsh \
 "
 

diff --git a/rootfs/etc/sysctl.d/99-vm-zram-parameters.conf b/rootfs/etc/sysctl.d/99-vm-zram-parameters.conf
@@ -0,0 +1,4 @@
+vm.swappiness = 180
+vm.watermark_boost_factor = 0
+vm.watermark_scale_factor = 125
+vm.page-cluster = 0
diff --git a/rootfs/etc/systemd/zram-generator.conf b/rootfs/etc/systemd/zram-generator.conf
@@ -0,0 +1,5 @@
+[zram0]
+zram-size = max(ram / 4, 8192)
+compression-algorithm = zst
+swap-priority = 100
+fs-type = swap
diff --git a/rootfs/usr/bin/sk-update-boot-entry b/rootfs/usr/bin/sk-update-boot-entry
@@ -21,7 +21,7 @@ if [[ "$service_status" == "enabled" ]]; then
 fi
 
 # swap uuid
-swap_dev=$(awk '$2 == "partition" && $1 ~ "^/dev/" {print $1}' /proc/swaps)
+swap_dev=$(awk '$2 == "partition" && $1 ~ "^/dev/[^z]" {print $1}' /proc/swaps)
 if [[ -n "$swap_dev" ]]; then
   SWAP_PARTUUID=$(lsblk -no PARTUUID -f "$swap_dev")
 fi

diff --git a/rootfs/usr/lib/frzr.d/bootconfig.conf b/rootfs/usr/lib/frzr.d/bootconfig.conf
@@ -1 +1 @@
-ibt=off pci=noaer split_lock_detect=off iomem=relaxed amd-pstate=passive nowatchdog
+ibt=off pci=noaer split_lock_detect=off iomem=relaxed amd-pstate=passive zswap.enabled=0 nowatchdog
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ibt=off pci=noaer split_lock_detect=off iomem=relaxed amd-pstate=passive nowatchdog
		ibt=off pci=noaer split_lock_detect=off iomem=relaxed amd-pstate=passive zswap.enabled=0 nowatchdog