Skip to content

Commit

Permalink
images: Drop redundant journal removes
Browse files Browse the repository at this point in the history
zero-disk.setup already does that.
  • Loading branch information
martinpitt committed Aug 26, 2024
1 parent 5542e4f commit ca684ff
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion images/scripts/bootc.setup
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ rm /var/cache/bootc.oci.tar
systemctl disable bootc-fetch-apply-updates.timer fstrim.timer logrotate.timer raid-check.timer

# reduce image size
rm -rf /var/log/journal/*
/var/lib/testvm/zero-disk.setup
1 change: 0 additions & 1 deletion images/scripts/ostree.setup
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,4 @@ done

# reduce image size
rpm-ostree cleanup --repomd
rm -rf /var/log/journal/*
/var/lib/testvm/zero-disk.setup
3 changes: 1 addition & 2 deletions images/scripts/rhel.setup
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ if [ "${IMAGE#rhel-8*}" != "$IMAGE" ]; then
TEST_PACKAGES="${TEST_PACKAGES/wireguard-tools /}"
fi

# RHEL 8 still uses the C pcp bridge
# RHEL 8 still uses the C pcp bridge
if [ "${IMAGE#rhel-8*}" != "$IMAGE" ]; then
COCKPIT_DEPS="${COCKPIT_DEPS/python3-pcp /}"
fi
Expand Down Expand Up @@ -472,7 +472,6 @@ mkdir -p /var/log/journal

# Final tweaks

rm -rf /var/log/journal/*
# RHEL 7 does not enable systemd-coredump by default, later versions do
if ! grep -qr core_pattern /usr/lib/sysctl.d/; then
echo "kernel.core_pattern=|/usr/lib/systemd/systemd-coredump %p %u %g %s %t %e" > /etc/sysctl.d/50-coredump.conf
Expand Down
2 changes: 0 additions & 2 deletions images/scripts/services.setup
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,5 @@ chmod 755 /root/run-grafana
# disable automatic updates
systemctl disable --now zincati.service

rm -rf /var/log/journal/*

# reduce image size
/var/lib/testvm/zero-disk.setup

0 comments on commit ca684ff

Please sign in to comment.