Don't run both rngd and haveged (#2890)

because they clash. We keedp haveged only because we can't know if there is special rng hardware or not. Fixes #2716 Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Sep 26, 2024 · 746447f · 746447f
1 parent c4e8b16
commit 746447f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine
@@ -86,7 +86,6 @@ RUN apk --no-cache add  \
       parted \
       qemu-guest-agent \
       rbd-nbd \
-      rng-tools \
       rsync \
       sgdisk \
       smartmontools \
@@ -149,4 +148,4 @@ RUN rc-update add sshd boot && \
     rc-update add cgroups sysinit && \
     rc-update add ntpd boot && \
     rc-update add crond && \
-    rc-update add fail2ban
+    rc-update add fail2ban
diff --git a/images/Dockerfile.kairos-alpine b/images/Dockerfile.kairos-alpine
@@ -85,7 +85,6 @@ RUN apk --no-cache add  \
       parted \
       qemu-guest-agent \
       rbd-nbd \
-      rng-tools \
       rsync \
       sgdisk \
       smartmontools \

diff --git a/images/Dockerfile.kairos-opensuse b/images/Dockerfile.kairos-opensuse
@@ -1,4 +1,5 @@
 # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=opensuse
+
 ###############################################################
 ####                           ARGS                        ####
 ###############################################################
@@ -71,7 +72,6 @@ RUN zypper in --force-resolution -y \
     policycoreutils \
     polkit \
     procps \
-    rng-tools \
     rsync \
     shim \
     squashfs \

diff --git a/images/Dockerfile.opensuse b/images/Dockerfile.opensuse
@@ -1,4 +1,5 @@
 # WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead
+
 ###############################################################
 ####                           ARGS                        ####
 ###############################################################
@@ -72,7 +73,6 @@ RUN zypper in --force-resolution -y \
     policycoreutils \
     polkit \
     procps \
-    rng-tools \
     rsync \
     shim \
     squashfs \