[Fedora-spins] [spin-kickstarts] Revert "spin-kickstarts patches"

Christoph Wickert cwickert at fedoraproject.org
Thu Feb 3 23:18:21 UTC 2011 

commit b20a608b89606ca863b15b5a8a2d6968275e4a84
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Feb 4 00:17:29 2011 +0100

    Revert "spin-kickstarts patches"
    
    This reverts commit 9d9f616744e86268c69b767993c242c8c5442055.
    I will apply the changes in 4 separate patches with correct comments.

 fedora-live-kde.ks   |   95 +++++++++++++++++++++++++++++++++++++++++++++++-
 fedora-livecd-kde.ks |   98 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 188 insertions(+), 5 deletions(-)
---
diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks
index 6132ada..354ea65 100644
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -18,7 +18,6 @@
 kdebase-workspace-wallpapers
 
 # Additional packages that are not default in kde-desktop but useful
-k3b				# ~15 megs
 -koffice-suite			# don't include whole koffice-suite, just parts of it
 koffice-kword
 koffice-kspread			# ~1 megs
@@ -50,7 +49,7 @@ wqy-microhei-fonts	# a compact CJK font
 -vlgothic-fonts
 -wqy-zenhei-fonts
 -paratype-pt-sans-fonts
-#-stix-fonts		# mathematical symbols
+#-stix-fonts            # mathematical symbols
 #-kacst*fonts*		# arabic
 
 # make sure alsaunmute is there
@@ -75,4 +74,96 @@ alsa-utils
 %end
 
 %post
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << 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 liveuser use KDE
+echo "startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
+
+# set up autologin for user liveuser
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
+
+# set up user liveuser as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.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
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+
+# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+chmod +x /usr/share/applications/liveinst.desktop
+
+# copy over the icons for liveinst to hicolor
+cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
+cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
+cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
+cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
+cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
+cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
+touch /usr/share/icons/hicolor/
+
+# Disable the update notifications of kpackagekit
+cat > /home/liveuser/.kde/share/config/KPackageKit << KPACKAGEKIT_EOF
+[CheckUpdate]
+autoUpdate=0
+interval=0
+
+[Notify]
+notifyLongTasks=2
+notifyUpdates=0
+KPACKAGEKIT_EOF
+
+# Disable kres-migrator
+cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
+[Migration]
+Enabled=false
+KRES_EOF
+
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukstrigiservice]
+autostart=false
+NEPOMUK_EOF
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+# don't use prelink on a running KDE live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
+
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
+
+EOF
+
 %end
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index d58af26..26ca0b4 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -23,12 +23,12 @@
 -ktorrent			# kget has also basic torrent features (~3 megs)
 -kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 -kdeartwork-screensavers	# screensavers are not needed on live images
-#-kipi-plugins			# ~8 megs
+-kipi-plugins			# ~8 megs
 #-konq-plugins			# ~2 megs
 #-kdeplasma-addons		# ~16 megs
+#-k3b*				# ~15 megs
 
 # Additional packages that are not default in kde-desktop but useful
-k3b				# ~15 megs
 -koffice-suite			# don't include whole koffice-suite, just parts of it
 koffice-kword
 koffice-kspread			# ~1 megs
@@ -60,7 +60,7 @@ wqy-microhei-fonts	# a compact CJK font
 -vlgothic-fonts
 -wqy-zenhei-fonts
 -paratype-pt-sans-fonts
-#-stix-fonts		# mathematical symbols
+#-stix-fonts
 #-kacst*fonts*		# arabic
 
 # make sure alsaunmute is there
@@ -85,4 +85,96 @@ alsa-utils
 %end
 
 %post
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << 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 liveuser use KDE
+echo "startkde" > /home/liveuser/.xsession
+chmod a+x /home/liveuser/.xsession
+chown liveuser:liveuser /home/liveuser/.xsession
+
+# set up autologin for user liveuser
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
+
+# set up user liveuser as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.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
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+
+# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+chmod +x /usr/share/applications/liveinst.desktop
+
+# copy over the icons for liveinst to hicolor
+cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
+cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
+cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
+cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
+cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
+cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
+touch /usr/share/icons/hicolor/
+
+# Disable the update notifications of kpackagekit
+cat > /home/liveuser/.kde/share/config/KPackageKit << KPACKAGEKIT_EOF
+[CheckUpdate]
+autoUpdate=0
+interval=0
+
+[Notify]
+notifyLongTasks=2
+notifyUpdates=0
+KPACKAGEKIT_EOF
+
+# Disable kres-migrator
+cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
+[Migration]
+Enabled=false
+KRES_EOF
+
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukstrigiservice]
+autostart=false
+NEPOMUK_EOF
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+# don't use prelink on a running KDE live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
+
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
+
+EOF
+
 %end

More information about the spins mailing list