system-maintenance: Clean up pending deployments as well

[bin.git] / system-maintenance

diff --git a/system-maintenance b/system-maintenance
index 96af4b31f4fab9989365969375d4ad58311e44d1..886d1842ee33aaae42f926a3501b68d17ff96eaf 100755 (executable)
--- a/system-maintenance
+++ b/system-maintenance
@@ -1,12 +1,21 @@
 #!/bin/sh
 set -eux
 
 #!/bin/sh
 set -eux
 

-rpm-ostree cleanup --rollback
+rpm-ostree cleanup --rollback || true

 rpm-ostree cleanup --repomd
 rpm-ostree cleanup --repomd

+rpm-ostree cleanup --pending

 rpm-ostree cleanup --base
 
 rpm-ostree cleanup --base
 

-rm -rf /srv/ostree/repo/
+# keep repo on tmpfs
+REPO=/var/tmp/repo/
+mkdir -p $REPO
+mount -t tmpfs tmpfs $REPO
+

 (cd ~martin/src/workstation-ostree-config/; ./compose.sh)
 rpm-ostree upgrade
 (cd ~martin/src/workstation-ostree-config/; ./compose.sh)
 rpm-ostree upgrade

+umount $REPO
+
+# fix fonts between Fedora releases
+rm -rf ~martin/.cache/fontconfig

 
 fstrim -av
 
 fstrim -av