From 0679b37d654ab96d81bd7e678ae3521712c7d6b2 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Nov 03 2014 20:27:08 +0000
Subject: Revert "Use fstrim to zero out empty space rather than forcing it with dd"


Nope -- still does not work

This reverts commit 99c9224ef57a58ccc40bb23cb3b93eb314b2f94c.

---

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 2f94492..ae288b3 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,8 +131,11 @@ rm -f /var/lib/rpm/__db*
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 
 
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
 
 %end
 
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 440589a..e88e24b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -216,8 +216,11 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
 
 %end
 
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 7bf1a7a..1a9ef6a 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -216,8 +216,11 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
 
 %end
 
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 529cb41..fb902a5 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -208,8 +208,11 @@ chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
 
-echo "Zeroing out empty space with fstrim."
-/usr/sbin/fstrim /
+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.)"
 
 %end