[configs/releng] explicit set 'Storage=volatile' for journald

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>

2 files changed, 2 insertions, 5 deletions

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 8f9ed42..fb65f09 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -236,7 +236,7 @@ _cleanup () {
     _msg_info "Cleaning up what we can on root-image..."
 
     # Delete initcpio image(s)
-    if [[ -d "${work_dir}/root-image/boot" ]]; then 
+    if [[ -d "${work_dir}/root-image/boot" ]]; then
         find "${work_dir}/root-image/boot" -type f -name '*.img' -delete
     fi
     # Delete kernel(s)
@@ -259,10 +259,6 @@ _cleanup () {
     if [[ -d "${work_dir}/root-image/var/log" ]]; then
         find "${work_dir}/root-image/var/log" -type f -delete
     fi
-    # Avoid journald use permanent storage (Storage=auto)
-    if [[ -d "${work_dir}/root-image/var/log/journal" ]]; then
-       rm -rf "${work_dir}/root-image/var/log/journal"
-    fi
     # Delete all temporary files and dirs
     if [[ -d "${work_dir}/root-image/var/tmp" ]]; then
         find "${work_dir}/root-image/var/tmp" -mindepth 1 -delete
diff --git a/configs/releng/root-image/root/customize_root_image.sh b/configs/releng/root-image/root/customize_root_image.sh
index a60f308..78c7bc0 100755
--- a/configs/releng/root-image/root/customize_root_image.sh
+++ b/configs/releng/root-image/root/customize_root_image.sh
@@ -16,5 +16,6 @@ chmod 750 /etc/sudoers.d
 chmod 440 /etc/sudoers.d/g_wheel
 
 sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
+sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
 
 systemctl enable multi-user.target pacman-init.service choose-mirror.service