From 746447f624a4c628375066bc6271fb5e9a4c0d8a Mon Sep 17 00:00:00 2001
From: Dimitris Karakasilis <dimitris@karakasilis.me>
Date: Thu, 26 Sep 2024 11:16:07 +0300
Subject: [PATCH] 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 https://github.com/kairos-io/kairos/issues/2716

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
---
 images/Dockerfile.alpine          | 3 +--
 images/Dockerfile.kairos-alpine   | 1 -
 images/Dockerfile.kairos-opensuse | 2 +-
 images/Dockerfile.opensuse        | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine
index 40cc4e148..a73e512d8 100644
--- 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
\ No newline at end of file
+    rc-update add fail2ban
diff --git a/images/Dockerfile.kairos-alpine b/images/Dockerfile.kairos-alpine
index d3b983fb4..8c543f601 100644
--- 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
index d89873bee..a33175409 100644
--- 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
index 4b19fe9ed..f3a895d5d 100644
--- 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 \