Drop HighContrast icon cache removal from %post scripts

It was added to save space, but since then it's considerably dropped in
size and just 50 KB now.

Makefile

@@ -18,6 +18,8 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
+	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
+	install -m 644 snippets/* $(DATADIR)/$(name)/snippets
 
 clean:
 	rm -f $(name)-*.tar.gz

fedora-live-base.ks

@@ -313,12 +313,6 @@ rm -f /core*
 # convince readahead not to collect
 # FIXME: for systemd
 
-# forcibly regenerate fontconfig cache (so long as this live image has
-# fontconfig) - see #1169979
-if [ -x /usr/bin/fc-cache ] ; then
-   fc-cache -f
-fi
-
 echo 'File created by kickstart. See systemd-update-done.service(8).' \
     | tee /etc/.updated >/var/.updated
 

fedora-live-mate_compiz.ks

@@ -79,7 +79,4 @@ chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 %end

fedora-live-security.ks

@@ -94,9 +94,6 @@ gnome-keyring-pam
 %post
 # xfce configuration
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 # create /etc/sysconfig/desktop (needed for installation)
 
 cat > /etc/sysconfig/desktop <<EOF

fedora-live-soas.ks

@@ -51,6 +51,7 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
+org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
@@ -58,6 +59,7 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries

fedora-live-workstation.ks

@@ -10,9 +10,6 @@ part / --size 6144
 
 %post
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 

fedora-live-xfce.ks

@@ -16,9 +16,6 @@
 %post
 # xfce configuration
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 # create /etc/sysconfig/desktop (needed for installation)
 
 cat > /etc/sysconfig/desktop <<EOF

fedora-xfce-packages.ks

@@ -25,6 +25,10 @@ gnome-keyring-pam
 # Note that blank is still default.
 xscreensaver-extras
 wget
+# Handy for debugging
+rfkill
+# Better more popular browser
+firefox
 system-config-printer
 
 # save some space

snippets/autologin-gdm.ks

@@ -1,12 +0,0 @@
-# %post modifications for gdm
-
-cat >> /etc/rc.d/init.d/fedora-live << EOF
-chown -R fedora:fedora /home/fedora
-sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
-    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
-    chown fedora:fedora /home/fedora/.face
-    # TODO: would be nice to get e-d-s to pick this one up too... but how?
-fi
-EOF
-

snippets/autologin-kdm.ks

@@ -1,33 +0,0 @@
-# %post modifications for kdm and kde
-
-# add initscript
-cat >> /etc/rc.d/init.d/fedora-live << EOF
-
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
-    # use image also for kdm
-    mkdir -p /usr/share/apps/kdm/faces
-    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
-fi
-
-# make fedora user use KDE
-echo "startkde" > /home/fedora/.xsession
-chmod a+x /home/fedora/.xsession
-chown fedora:fedora /home/fedora/.xsession
-
-# set up autologin for user fedora
-sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
-
-# set up user fedora as default user and preselected user
-sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
-
-# add liveinst.desktop to favorites menu
-mkdir -p /home/fedora/.kde/share/config/
-cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
-[Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
-MENU_EOF
-chown -R fedora:fedora /home/fedora/.kde/
-EOF
-

snippets/config-developer.ks

@@ -1,7 +0,0 @@
-# %post modifications to add link to demonstration videos to desktop
-
-cat >> /etc/rc.d/init.d/fedora-live << EOF
-pushd /home/fedora/Desktop
-ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
-popd
-EOF

snippets/config-electronic-lab.ks

@@ -1,57 +0,0 @@
-# %post modifications specifically for Fedora Electronic Lab
-
-# Fedora Electronic Lab: Kwin buttons
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
-[Style]
-ButtonsOnLeft=MB
-ButtonsOnRight=FIAX
-CustomButtonPositions=true
-EOF
-
-# kill klipper
-cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
-[General]
-AutoStart=false
-EOF
-
-# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
-cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
-[Digital]
-LCD_Style=false
-Show_Date=false
-Show_Seconds=true
-
-[General]
-Type=Digital
-EOF
-
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
-[Layout]
-DisplayNames=
-EnableXkbOptions=false
-IncludeGroups=
-LayoutList=us,de,fr,jp
-Model=pc104
-Options=
-ResetOldOptions=false
-ShowFlag=true
-ShowSingle=true
-StickySwitching=false
-StickySwitchingDepth=2
-SwitchMode=Global
-Use=true
-EOF
-
-# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
-# This is a feature for Fedora and not for KDE
-cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
-
-/sbin/chkconfig anacron off
-/sbin/chkconfig sendmail off
-/sbin/chkconfig nfs off
-/sbin/chkconfig nfslock off
-/sbin/chkconfig rpcidmapd off
-/sbin/chkconfig rpcbind off

snippets/config-kde-gnome-keyring.ks

@@ -1,19 +0,0 @@
-# %post modifications to set up gnome-keyring in KDE
-
-mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
-cat > /etc/skel/.kde/env/start-custom.sh << EOF
-#!/bin/sh
-eval \`gnome-keyring-daemon\`
-export GNOME_KEYRING_PID
-export GNOME_KEYRING_SOCKET
-EOF
-chmod 755 /etc/skel/.kde/env/start-custom.sh
-
-cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
-#/bin/sh
-if [-n "$GNOME_KEYRING_PID"]; then
-	kill $GNOME_KEYRING_PID
-fi
-EOF
-
-chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh

snippets/config-tracker.ks

@@ -1,16 +0,0 @@
-# %post modifications to configure tracker search
-
-mkdir -p /home/fedora/.config/tracker
-
-cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
-[Indexing]
-EnableIndexing=false
-Language=en
-EOF
-
-mkdir -p /root/.config/tracker
-cat > /root/.config/tracker/tracker.cfg <<EOF
-[Indexing]
-EnableIndexing=false
-Language=en
-EOF

snippets/eeepc900-modifications.ks

@@ -1,164 +0,0 @@
-###### Eee PC 900 stuff ####################################################
-#
-###### Hotkeys #############################################################
-cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
-#!/bin/bash
-
-export DISPLAY=:0
-
-case "$3" in
-
-    #Fn+F2
-    00000010)
-        # Wlan On
-        /etc/acpi/actions/wlan.sh poweron
-        ;;
-    00000011)
-        # Wlan Off
-        /etc/acpi/actions/wlan.sh poweroff
-        ;;
-
-    #Fn+F6
-    00000012)
-        # Webcam switch
-        /etc/acpi/actions/camera.sh
-        # TaskManager
-	# /usr/bin/gnome-system-monitor
-	;;
-
-    #Fn+F7
-    00000013)
-        # Volume mute
-	/usr/bin/amixer set -D hw:0 Master toggle
-	;;
-
-    #Fn+F8
-    00000014)
-        # Volume down
-        /usr/bin/amixer set -D hw:0 Master 10%- unmute
-        ;;
-
-    #Fn+F9
-    00000015)
-        # Volume up
-        /usr/bin/amixer set -D hw:0 Master 10%+ unmute
-        ;;
-
-    #Fn+F5
-    00000030)
-
-	/usr/bin/xrandr --output VGA  --mode 1024x768 \
-			--output LVDS --off
-
-	if [[ "$?" != "0" ]]; then
-
-	/usr/bin/xrandr --output VGA  --preferred \
-			--output LVDS --off
-
-	fi
-	;;
-
-    00000031)
-
-	/usr/bin/xrandr --output LVDS --mode 800x480 \
-		        --output VGA  --mode 800x600
-
-        ;;
-    
-    00000032)
-
-	/usr/bin/xrandr --output VGA  --off       \
-           		--output LVDS --preferred
-
-        ;;
-    *)
-        logger "ACPI hotkey $3 action is not defined"
-        ;;
-esac
-EOHOTKEY
-
-###### WLAN #############################################################
-cat > /etc/acpi/actions/wlan.sh << EOF
-#!/bin/bash
-
-PWR=$(cat /sys/devices/platform/eeepc/wlan)
-
-UnloadModules() {
-    rmmod ath_pci
-    rmmod ath_rate_sample
-    rmmod wlan_scan_sta
-    rmmod wlan_tkip
-    rmmod wlan_wep
-    rmmod wlan
-}
-
-LoadModules() {
-    modprobe ath_pci
-}
-
-case $1 in
-    poweron)
-        if [[ "$PWR" = "0" ]]; then
-            modprobe pciehp pciehp_force=1
-
-	    echo 1 > /sys/devices/platform/eeepc/wlan
-
-	    rmmod pciehp
-
-        fi
-        ;;
-           
-    poweroff)
-        if [[ "$PWR" = "1" ]]; then
-
-            modprobe pciehp pciehp_force=1
-
-            ifconfig ath0 down
-
-            wlanconfig ath0 destroy
-
-            UnloadModules
-
-            echo 0 > /sys/devices/platform/eeepc/wlan
-
-            rmmod pciehp
-
-        fi
-        ;;
-esac
-EOF
-
-###### Webcam #############################################################
-cat > /etc/acpi/actions/camera.sh << EOF
-
-#!/bin/bash
-
-CAMERA=$(cat /sys/devices/platform/eeepc/camera)
-
-        if [[ "$CAMERA" = "0" ]]; then
-   	    echo 1 > /sys/devices/platform/eeepc/camera
-         else
-            echo 0 > /sys/devices/platform/eeepc/camera
-        fi
-EOF
-
-chmod +x "/etc/acpi/actions/*"
-
-###### Shutdown fix #########################################################
-echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
-chmod 755 /sbin/halt.local
-
-###### Gnome display stuff ##################################################
-
-gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
-gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
-gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
-gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
-gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
-gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
-gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
-gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
-gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
-gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
-gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
-gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19

snippets/repository-debuginfo.ks

@@ -1,25 +0,0 @@
-# %post modifications to enable debuginfo repository
-
-awk '
-BEGIN {
-  debuginfo = 0
-}
-  /^\[.*\]/ {
-  if (/debuginfo/) {
-    debuginfo = 1
-  } else {
-    debuginfo = 0
-  }
-  print
-  next
-}
-  /enabled=0/ && debuginfo {
-  print "enabled=1"
-  next
-}
-{
-  print
-  next
-}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
-mv /etc/yum.repos.d/fedora.repo{.tmp,}
-

snippets/screensaver-gnome.ks

@@ -1,5 +0,0 @@
-# %post modifications to disable GNOME screensaver locking
-
-cat >> /etc/rc.d/init.d/fedora-live << EOF
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
-EOF

snippets/screensaver-kde.ks

@@ -1,3 +0,0 @@
-# %post modifications to disable KDE screensaver
-
-sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc

snippets/sysconfig-kde.ks

@@ -1,6 +0,0 @@
-# %post modifications to create /etc/sysconfig/desktop for KDE
-
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF

snippets/sysconfig-xfce.ks

@@ -1,5 +0,0 @@
-# %post modifications to create /etc/sysconfig/desktop for XFCE
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/startxfce4
-EOF