From e7575bafcd8f2d8c4794ba177d8e856c35e5699e Mon Sep 17 00:00:00 2001 From: Chris Murphy Date: Wed, 8 Jul 2020 19:13:34 -0600 Subject: [PATCH] Remove references to zram and zram-swap The zram package and its zram-swap service are obsoleted as part of the swaponzram change. https://fedoraproject.org/wiki/Changes/SwapOnZRAM Signed-off-by: Chris Murphy --- fedora-arm-base.ks | 3 +-- fedora-disk-base.ks | 3 +-- fedora-disk-minimal.ks | 2 +- fedora-disk-server.ks | 2 +- fedora-disk-workstation.ks | 2 +- fedora-disk-xfce.ks | 2 +- fedora-iot.ks | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index f4d02b1..2fe3e2a 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -11,7 +11,7 @@ part /boot --size=512 --fstype ext4 --asprimary # make sure that initial-setup runs and lets us do all the configuration bits firstboot --reconfig -services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-swap +services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup %include fedora-repo.ks @@ -19,7 +19,6 @@ services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup,zram-s @core @standard @hardware-support -zram kernel # remove this in %post diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index aab028b..1921fd3 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -13,7 +13,7 @@ keyboard us timezone US/Eastern selinux --enforcing firewall --enabled --service=mdns -services --enabled=sshd,NetworkManager,chronyd,zram-swap +services --enabled=sshd,NetworkManager,chronyd network --bootproto=dhcp --device=link --activate rootpw --lock --iscrypted locked shutdown @@ -32,7 +32,6 @@ firstboot --reconfig @core @standard @hardware-support -zram kernel # remove this in %post diff --git a/fedora-disk-minimal.ks b/fedora-disk-minimal.ks index 2ffc819..0218b65 100644 --- a/fedora-disk-minimal.ks +++ b/fedora-disk-minimal.ks @@ -1,7 +1,7 @@ %include fedora-disk-base.ks %include fedora-minimal-common.ks -services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap +services --enabled=sshd,NetworkManager,chronyd,initial-setup autopart --type=plain --noswap diff --git a/fedora-disk-server.ks b/fedora-disk-server.ks index b6311e2..9fb1217 100644 --- a/fedora-disk-server.ks +++ b/fedora-disk-server.ks @@ -1,6 +1,6 @@ %include fedora-disk-base.ks -services --enabled=sshd,NetworkManager,chronyd,initial-setup,zram-swap +services --enabled=sshd,NetworkManager,chronyd,initial-setup autopart --noswap diff --git a/fedora-disk-workstation.ks b/fedora-disk-workstation.ks index 5342b13..f61316c 100644 --- a/fedora-disk-workstation.ks +++ b/fedora-disk-workstation.ks @@ -4,7 +4,7 @@ bootloader --append="cma=256MB" -services --enabled=sshd,NetworkManager,chronyd,zram-swap +services --enabled=sshd,NetworkManager,chronyd autopart --type=btrfs --noswap diff --git a/fedora-disk-xfce.ks b/fedora-disk-xfce.ks index 70205b6..4a3b616 100644 --- a/fedora-disk-xfce.ks +++ b/fedora-disk-xfce.ks @@ -4,7 +4,7 @@ bootloader --append="cma=192MB" -services --enabled=sshd,NetworkManager,chronyd,zram-swap +services --enabled=sshd,NetworkManager,chronyd autopart --type=btrfs --noswap diff --git a/fedora-iot.ks b/fedora-iot.ks index 083c6db..9f8e5a5 100644 --- a/fedora-iot.ks +++ b/fedora-iot.ks @@ -11,7 +11,7 @@ rootpw --lock --iscrypted locked bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4" network --bootproto=dhcp --device=link --activate --onboot=on -services --enabled=NetworkManager,sshd,rngd,zram-swap +services --enabled=NetworkManager,sshd,rngd zerombr clearpart --all --initlabel --disklabel=msdos