#658 Replace 'zram' with 'zram-generator', and exclude Cloud edition
Merged 3 years ago by kevin. Opened 3 years ago by chrismurphy.
Unknown source f33-swaponzram  into  master

file modified
+1 -2
@@ -11,7 +11,7 @@

  # 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 @@

  @core

  @standard

  @hardware-support

- zram

  

  kernel

  # remove this in %post

file modified
+2
@@ -83,6 +83,8 @@

  # No need for plymouth. Also means anaconda won't put rhgb/quiet

  # on kernel command line

  -plymouth

+ # noswap on Cloud for now

+ -zram-generator-defaults

  

  %end

  

file modified
+1 -2
@@ -13,7 +13,7 @@

  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 @@

  @core

  @standard

  @hardware-support

- zram

  

  kernel

  # remove this in %post

file modified
+1 -1
@@ -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

  

file modified
+1 -1
@@ -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

  

file modified
+1 -1
@@ -4,7 +4,7 @@

  

  bootloader --append="cma=256MB"

  

- services --enabled=sshd,NetworkManager,chronyd,zram-swap

+ services --enabled=sshd,NetworkManager,chronyd

  

  autopart --type=btrfs --noswap

  

file modified
+1 -1
@@ -4,7 +4,7 @@

  

  bootloader --append="cma=192MB"

  

- services --enabled=sshd,NetworkManager,chronyd,zram-swap

+ services --enabled=sshd,NetworkManager,chronyd

  

  autopart --type=btrfs --noswap

  

file modified
+1 -1
@@ -11,7 +11,7 @@

  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