3 commits - generic/fedora-19-i386-cloud.ks generic/fedora-19-i386.ks generic/fedora-19-i386-minimal.ks generic/fedora-19-x86_64-cloud.ks generic/fedora-19-x86_64.ks generic/fedora-19-x86_64-minimal.ks
Matthew Miller
mattdm at fedoraproject.org
Thu Jun 20 13:53:05 UTC 2013
generic/fedora-19-i386-cloud.ks | 16 ++++++++++------
generic/fedora-19-i386-minimal.ks | 13 ++++++-------
generic/fedora-19-i386.ks | 16 ++++++++++------
generic/fedora-19-x86_64-cloud.ks | 16 ++++++++++------
generic/fedora-19-x86_64-minimal.ks | 13 ++++++-------
generic/fedora-19-x86_64.ks | 16 ++++++++++------
6 files changed, 52 insertions(+), 38 deletions(-)
New commits:
commit 31947b0bbb7c0f3a280d5c51be88bde06f608d5b
Author: Matthew Miller <mattdm at mattdm.org>
Date: Thu Jun 20 09:50:39 2013 -0400
Revert fstrim commit because it's causing build problems. Old way slow but
effective.
In virt-install via kvm, getting "FITRIM ioctl failed: Operation not
supported". Also fails in appliance-creator via koji -- probably EL kernel mismatch.
This reverts commit 7052fa9cd6364e45dee1a5f3fe03f95e69f71fe1.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 13f0117..9756947 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -221,8 +221,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index 533bb16..773cee8 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -188,8 +188,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index 502576d..65b4c37 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -180,8 +180,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 469310f..cce623d 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -218,8 +218,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index 6777c20..3ad7614 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -186,8 +186,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 1c1794b..d2aba45 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -178,8 +178,11 @@ echo "Cleaning old yum repodata."
yum clean all
truncate -c -s 0 /var/log/yum.log
-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
commit de0fd360d5bce6c15cfdff827ac8af1f0acca0d9
Author: Matthew Miller <mattdm at mattdm.org>
Date: Tue Jun 18 11:15:10 2013 -0400
yum log from initial creation is boring and just has cleanup artifacts
from this kickstart. truncate it and start from 0 instead.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 8834325..13f0117 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -219,6 +219,7 @@ sed -i 's/ec2-user/fedora/;s/EC2 user/Fedora Cloud User/' /etc/cloud/cloud.cfg
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index e011053..533bb16 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -186,6 +186,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index daee9ea..502576d 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -178,6 +178,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index 15fa592..469310f 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -216,6 +216,7 @@ sed -i 's/ec2-user/fedora/;s/EC2 user/Fedora Cloud User/' /etc/cloud/cloud.cfg
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index 9cb5182..6777c20 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -184,6 +184,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index 7f636c2..1c1794b 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -176,6 +176,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
echo "Cleaning old yum repodata."
yum clean all
+truncate -c -s 0 /var/log/yum.log
echo "Zeroing out empty space with fstrim."
/usr/sbin/fstrim /
commit 628c3af4c96d793bb85e1868521734a67bb7503a
Author: Matthew Miller <mattdm at mattdm.org>
Date: Tue Jun 18 11:12:21 2013 -0400
disable persistant journal -- we're still using rsyslog, and don't
really have the luxury of using space for double-logging.
diff --git a/generic/fedora-19-i386-cloud.ks b/generic/fedora-19-i386-cloud.ks
index 2a92bc6..8834325 100644
--- a/generic/fedora-19-i386-cloud.ks
+++ b/generic/fedora-19-i386-cloud.ks
@@ -107,10 +107,10 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/
-#echo .
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/
+echo .
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
diff --git a/generic/fedora-19-i386-minimal.ks b/generic/fedora-19-i386-minimal.ks
index 95df672..e011053 100644
--- a/generic/fedora-19-i386-minimal.ks
+++ b/generic/fedora-19-i386-minimal.ks
@@ -101,11 +101,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# because we didn't install rsyslog, enable persistent journal
-echo -n "Enabling persistent journal"
-mkdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
diff --git a/generic/fedora-19-i386.ks b/generic/fedora-19-i386.ks
index 24b0e0b..daee9ea 100644
--- a/generic/fedora-19-i386.ks
+++ b/generic/fedora-19-i386.ks
@@ -88,10 +88,10 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/
-#echo .
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/
+echo .
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
diff --git a/generic/fedora-19-x86_64-cloud.ks b/generic/fedora-19-x86_64-cloud.ks
index b89d417..15fa592 100644
--- a/generic/fedora-19-x86_64-cloud.ks
+++ b/generic/fedora-19-x86_64-cloud.ks
@@ -103,10 +103,10 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/
-#echo .
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/
+echo .
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
diff --git a/generic/fedora-19-x86_64-minimal.ks b/generic/fedora-19-x86_64-minimal.ks
index 133a882..9cb5182 100644
--- a/generic/fedora-19-x86_64-minimal.ks
+++ b/generic/fedora-19-x86_64-minimal.ks
@@ -99,11 +99,6 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# because we didn't install rsyslog, enable persistent journal
-echo -n "Enabling persistent journal"
-mkdir /var/log/journal/
-echo .
-
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware --setopt="clean_requirements_on_remove=1"
diff --git a/generic/fedora-19-x86_64.ks b/generic/fedora-19-x86_64.ks
index bb19668..7f636c2 100644
--- a/generic/fedora-19-x86_64.ks
+++ b/generic/fedora-19-x86_64.ks
@@ -86,10 +86,10 @@ rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
-# If you want to remove rsyslog and just use journald, also uncomment this.
-#echo -n "Enabling persistent journal"
-#mkdir /var/log/journal/
-#echo .
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/
+echo .
# this is installed by default but we don't need it in virt
echo "Removing linux-firmware package."
More information about the cloud
mailing list