From 99c9224ef57a58ccc40bb23cb3b93eb314b2f94c Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Thu, 23 Oct 2014 15:30:24 -0400
Subject: [PATCH] Use fstrim to zero out empty space rather than forcing it
 with dd

This didn't work with appliance-creator but _should_ for imagefactory. It's
a whole lot faster too.
---
 fedora-cloud-atomic.ks       | 7 ++-----
 fedora-cloud-base.ks         | 7 ++-----
 fedora-cloud-bigdata.ks      | 7 ++-----
 fedora-cloud-experimental.ks | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index ae288b3..2f94492 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,11 +131,8 @@ rm -f /var/lib/rpm/__db*
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 
 
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
 
 %end
 
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index f086a4b..21ff23d 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -210,11 +210,8 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
 
 %end
 
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 1a9ef6a..7bf1a7a 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -216,11 +216,8 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
 
 %end
 
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index fb902a5..529cb41 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -208,11 +208,8 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
+echo "Zeroing out empty space with fstrim."
+/usr/sbin/fstrim /
 
 %end