From ee367f90b07051a466faa503c663a01c37e4905a Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Thu, 19 Jan 2017 22:30:39 -0500
Subject: [PATCH] docker-min: merge pruning commands

Merge pruning commands. Don't rm /etc/machine-id or /run/ because we
just ran commands to touch /etc/machine-id and /run/lock
---
 fedora-docker-base-minimal.ks | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fedora-docker-base-minimal.ks b/fedora-docker-base-minimal.ks
index 9f041f2..e730914 100644
--- a/fedora-docker-base-minimal.ks
+++ b/fedora-docker-base-minimal.ks
@@ -52,10 +52,6 @@ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "# fstab intentionally empty for containers" > /etc/fstab
 
-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
@@ -88,6 +84,6 @@ rm usr/sbin/{glibc_post_upgrade.x86_64,sln}
 ln usr/bin/ln usr/sbin/sln
 
 # Final pruning
-rm -rf etc/machine-id var/cache/* var/log/* run/* tmp/*
+rm -rf var/cache/* var/log/* tmp/*
 
 %end