commit 93d713f02da27f705b8dfb9e202db4a9d010b620 Author: Christoph Wickert <cwickert(a)fedoraproject.org&gt; Date: Sun May 8 22:35:49 2011 +0200 Design Suite: Fixes for F15 / GNOME 3 fedora-livecd-design-suite.ks | 103 ++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 31 deletions(-) --- diff --git a/fedora-livecd-design-suite.ks b/fedora-livecd-design-suite.ks index 38564e5..ccd8517 100644 --- a/fedora-livecd-design-suite.ks +++ b/fedora-livecd-design-suite.ks @@ -12,11 +12,9 @@ # gnome desktop gdm -gnome-python2-gconf -gnome-desktop gnome-panel gnome-session -gnome-terminal +gnome-shell metacity nautilus @@ -24,20 +22,20 @@ nautilus agave blender cinepaint -entangle +# entangle # does not work in a gtk+ 3 environment fontforge fontmatrix # fyre gimp gimp-*-plugin GREYCstoration-gimp -# hugin +# hugin # is huge inkscape mypaint nautilus-image-converter optipng -# pinta -# postr +# pinta # is huge because it needs mono +postr rawtherapee scribus shotwell @@ -51,7 +49,7 @@ dia evince gnote gnumeric -hamster-applet +# hamster-applet # no more applets in gnome-shell # pdfmod # internet @@ -60,13 +58,14 @@ evolution firefox # audio & video -jokosher +# jokosher # no longer available pitivi rhythmbox totem # system gedit +gnome-terminal gnome-utils gtk-recordmydesktop NetworkManager-gnome @@ -76,43 +75,85 @@ NetworkManager-gnome %post cat >> /etc/rc.d/init.d/livesys << EOF # disable screensaver locking -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null +cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE +[org.gnome.desktop.screensaver] +lock-enabled=false +FOE -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 +# and hide the lock screen option +cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE +[org.gnome.desktop.lockdown] +disable-lock-screen=true +FOE + +# disable updates plugin +cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE +[org.gnome.settings-daemon.plugins.updates] +active=false +FOE + +# make the installer show up +if [ -f /usr/share/applications/liveinst.desktop ]; then + # Show harddisk install in shell dash + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" + # need to move it to anaconda.desktop to make shell happy + mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + + cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE +[org.gnome.shell] +favorite-apps=['mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'inkscape-course.desktop', 'anaconda.desktop'] FOE -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chown -R liveuser.liveuser /home/liveuser/Desktop -chmod a+x /home/liveuser/Desktop/liveinst.desktop + # add installer to user menu + mkdir -p ~liveuser/.local/share/gnome-shell/extensions/Installer(a)shell-extensions.fedoraproject.org + cat >> ~liveuser/.local/share/gnome-shell/extensions/Installer(a)shell-extensions.fedoraproject.org/metadata.json << FOE +{"shell-version": ["2.91.91"], "uuid": &quot;Installer(a)shell-extensions.fedoraproject.org&quot;, "name": "Installer", "description": "Install OS from user menu"} +FOE + + cat >> ~liveuser/.local/share/gnome-shell/extensions/Installer(a)shell-extensions.fedoraproject.org/extension.js << FOE +const PopupMenu = imports.ui.popupMenu; +const Shell = imports.gi.Shell; +const Main = imports.ui.main; +const Util = imports.misc.util; + +function main() { + let app = Shell.AppSystem.get_default().get_app('anaconda.desktop'); + let item = new PopupMenu.PopupMenuItem(app.get_name()); + item.connect('activate', function() { app.activate(-1); }); + + Main.panel._statusmenu.menu.addMenuItem(item, Main.panel._statusmenu.menu._getMenuItems().length - 1); +} +FOE -# But not trash and home -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null +fi + +# rebuild schema cache with any overrides we installed +glib-compile-schemas /usr/share/glib-2.0/schemas + +# set up auto-login +cat >> /etc/gdm/custom.conf << FOE +[daemon] +AutomaticLoginEnable=True +AutomaticLogin=liveuser +FOE # Turn off PackageKit-command-not-found while uninstalled -sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +if [ -f /etc/PackageKit/CommandNotFound.conf ]; then + sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf +fi # Add link to the Inkscape Course -cat >> /home/liveuser/Desktop/inkscape-course.desktop << FOE -#!/usr/bin/env xdg-open +cat >> /usr/share/applications/inkscape-course.desktop << FOE [Desktop Entry] Name=Introduction To Inkscape GenericName=Inkscape Course Comment=Materials from Máirín Duffy's Inkscape Class -Exec=/usr/bin/firefox http://linuxgrrl.com/learn/Introduction_To_Inkscape +Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape Type=Application Icon=fedora-logo-icon +Categories=Graphics;Documentation; FOE -chmod a+x /home/liveuser/Desktop/inkscape-course.desktop +chmod a+x /usr/share/applications/inkscape-course.desktop EOF