summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-03-23 11:56:47 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-03-23 11:59:04 -0400
commit47eaac1dc1f15de620d5409ee817de8fdf30d133 (patch)
tree9be1532dd6a2517126f41d94ac9715f335b3b1db
parent9a222daf121e1265a859850e2b064b61a929ca44 (diff)
downloadspin-kickstarts-47eaac1dc1f15de620d5409ee817de8fdf30d133.tar.gz
spin-kickstarts-47eaac1dc1f15de620d5409ee817de8fdf30d133.tar.xz
spin-kickstarts-47eaac1dc1f15de620d5409ee817de8fdf30d133.zip
base: prevent unintended failures in the livesys initscript
Some of the tweaks we do there may fail if the packages containing the touched files are not present. Better be careful.
-rw-r--r--fedora-live-base.ks12
1 files changed, 6 insertions, 6 deletions
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 96bd99b..f2d7766 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -188,21 +188,21 @@ chkconfig --level 345 firstboot off 2>/dev/null
echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
# don't start yum-updatesd for livecd boots
-chkconfig --level 345 yum-updatesd off 2>/dev/null
+chkconfig --level 345 yum-updatesd off 2>/dev/null || :
# turn off mdmonitor by default
-chkconfig --level 345 mdmonitor off 2>/dev/null
+chkconfig --level 345 mdmonitor off 2>/dev/null || :
# turn off setroubleshoot on the live image to preserve resources
-chkconfig --level 345 setroubleshoot off 2>/dev/null
+chkconfig --level 345 setroubleshoot off 2>/dev/null || :
# don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.settings-daemon.plugins.updates active 'false'
+gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :
# don't start cron/at as they tend to spawn things which are
# disk intensive that are painful on a live image
-chkconfig --level 345 crond off 2>/dev/null
-chkconfig --level 345 atd off 2>/dev/null
+chkconfig --level 345 crond off 2>/dev/null || :
+chkconfig --level 345 atd off 2>/dev/null || :
# Stopgap fix for RH #217966; should be fixed in HAL instead
touch /media/.hal-mtab