From 18d70001ec5321f25827d1ec5f9ee6a1ef9cd465 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 3 Feb 2011 22:48:06 +0100 Subject: [PATCH] fedora-live*-kde.ks: Remove duplicated %post, already in fedora-live-kde-base.ks --- fedora-live-kde.ks | 92 -------------------------------------------- fedora-livecd-kde.ks | 92 -------------------------------------------- 2 files changed, 184 deletions(-) diff --git a/fedora-live-kde.ks b/fedora-live-kde.ks index b95f6d7..a84477a 100644 --- a/fedora-live-kde.ks +++ b/fedora-live-kde.ks @@ -74,96 +74,4 @@ alsa-utils %end %post - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /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 ba6ea8c..b2fbf64 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -85,96 +85,4 @@ alsa-utils %end %post - -# create /etc/sysconfig/desktop (needed for installation) -cat > /etc/sysconfig/desktop <> /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