From 49600a8113df8815fe447626fe3791e454efe157 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 22 Mar 2017 12:10:29 -0400
Subject: config-mgmt-swap: Switch zswap to the default z3fold.

---
 config-mgmt-swap.PKGBUILD | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/config-mgmt-swap.PKGBUILD b/config-mgmt-swap.PKGBUILD
index 3705a1d..48f3318 100644
--- a/config-mgmt-swap.PKGBUILD
+++ b/config-mgmt-swap.PKGBUILD
@@ -1,10 +1,11 @@
 . ${BUILDFILE%/*}/common.sh
-pkgver=20170205
+pkgver=20170322
 
 package() {
 preamble
 
 depends=(systemd-swap)
+conflicts=('linux-lts<4.7') # because we want z3fold compression from 4.7
 
 # In addition to what's configured in fstab, we use systemd-swap to
 # manage advanced swap devices.  There are 3 things we enable in
@@ -19,12 +20,6 @@ add-file -m755 usr/share/holo/files/10-"$pkgname"/etc/systemd/swap.conf.holoscri
 sed '
 	s/^# Zswap\$/& (compress pages on disk)/
 	s/zswap_enabled=.*/zswap_enabled=1/
-	/zswap_zpool=z3fold/ {
-		a# The systemd-swap default '\''z3fold'\'' was added in Linux 4.7; because we
-		a# are running an -lts kernel, we'\''re still on 4.4, so we fall back to
-		a# zbud.
-		azswap_zpool=zbud
-	}
 
 	/^# ZRam\$/s/.*/& (compress pages in RAM)/
 	s/zram_enabled=.*/zram_enabled=1/
-- 
cgit v1.2.3