[Fedora-spins] [spin-kickstarts] Fix don't run prelink patch.

Bruno Wolff III bruno at fedoraproject.org
Sun Apr 3 13:42:49 UTC 2011


commit fc56888436cb0af4edcea719cef013222b5a547b
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Apr 3 08:41:31 2011 -0500

    Fix don't run prelink patch.
    
    I accidentally stuck it in the wrong place on the last commit, and forgot to
    do both live-base and live-mini.

 fedora-live-base.ks |    6 +++---
 fedora-live-mini.ks |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0ac6a5d..0bd56c5 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -190,6 +190,9 @@ chkconfig --level 345 firstboot off 2>/dev/null
 # with systemd, but we can look into that later. - AdamW 2010/08 F14Alpha
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
+# don't use prelink on a running live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
+
 # don't start yum-updatesd for livecd boots
 chkconfig --level 345 yum-updatesd off 2>/dev/null || :
 
@@ -309,9 +312,6 @@ rm -f /var/lib/rpm/__db*
 # from causing massive changes on systems booted longer than a day. 
 /usr/sbin/prelink -am &>/dev/null || :
 
-# don't use prelink on a running live image
-sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
-
 # save a little bit of space at least...
 rm -f /boot/initramfs*
 # make sure there aren't core files lying around
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 8ac4a63..680d304 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -255,6 +255,9 @@ chkconfig --level 345 firstboot off 2>/dev/null
 # The above doesn't works so we need to do this... GRR systemctl
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
+# don't use prelink on a running live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
+
 # don't start yum-updatesd for livecd boots
 chkconfig --level 345 yum-updatesd off 2>/dev/null
 


More information about the spins mailing list