Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

This commit is contained in:
Peter Robinson 2012-10-05 09:44:06 +01:00
commit 39bc71595e
2 changed files with 6 additions and 118 deletions

View File

@ -17,6 +17,8 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch #repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch #repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
%include fedora-live-minimization.ks
%packages %packages
@base-x @base-x
@standard @standard
@ -25,11 +27,6 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
kernel kernel
memtest86+ memtest86+
# grub-efi and grub2 and efibootmgr so anaconda can use the right one on install.
grub-efi
grub2
efibootmgr
# implicitly include the fonts we want # implicitly include the fonts we want
liberation-mono-fonts liberation-mono-fonts
liberation-sans-fonts liberation-sans-fonts
@ -42,27 +39,19 @@ dejavu-sans-mono-fonts
dejavu-serif-fonts dejavu-serif-fonts
# We like noise # We like noise
alsa-plugins-pulseaudio @multimedia
alsa-utils
pulseaudio
pulseaudio-module-x11
pulseaudio-utils
# Remove default base packages we don't want # Remove default base packages we don't want
-coolkey
-dos2unix -dos2unix
-dump -dump
-finger -finger
-fprintd-pam -fprintd-pam
-hunspell -hunspell
-irda-utils
-jwhois -jwhois
-lftp -lftp
-mlocate -mlocate
-nano -nano
-nc
-nfs-utils -nfs-utils
-nss_ldap
-numactl -numactl
-pcmciautils -pcmciautils
-pm-utils -pm-utils
@ -70,36 +59,17 @@ pulseaudio-utils
-rdist -rdist
-rsh -rsh
-rsync -rsync
-sendmail
-sos -sos
-stunnel -stunnel
-system-config-firewall-tui
-system-config-network-tui
-talk
-time -time
-tree -tree
-words -words
-ypbind -ypbind
# Remove default base-x packages we don't want
-cups-pk-helper
-glx-utils
-system-config-date
-system-config-firewall
-system-config-network
-system-config-printer
-system-config-services
-system-config-users
# Remove default unwanted hardware firmware and support we don't want # Remove default unwanted hardware firmware and support we don't want
-foomatic* -foomatic*
-ghostscript* -ghostscript*
-ivtv-firmware -ivtv-firmware
-ql2100-firmware
-ql2200-firmware
-ql23xx-firmware
-ql2400-firmware
-ql2500-firmware
# These are listed somewhere other than hardware support! # These are listed somewhere other than hardware support!
-irda-utils -irda-utils
-fprintd* -fprintd*
@ -110,15 +80,14 @@ pulseaudio-utils
-man-pages* -man-pages*
-words -words
# livecd bits to set up the livecd and be able to install # The point of a live image is to install
anaconda anaconda
@anaconda-tools
# Add some useful utils # Add some useful utils
system-config-firewall-base firewall-config
gnome-packagekit gnome-packagekit
powertop powertop
gnupg2
yum-presto
avahi avahi
# Remove sendmail: this needs to be explicit # Remove sendmail: this needs to be explicit

View File

@ -1,81 +0,0 @@
# Maintained by the Fedora Mini SIG:
# https://fedoraproject.org/wiki/SIGs/FedoraMini
%include fedora-live-mini.ks
%packages
# MeeGo NetBook UX
@meego-netbook
notification-daemon
gnome-terminal
empathy
gypsy
geoclue-gypsy
firefox
dates
contacts
tasks
# remove while it crashes X
# gnome-bluetooth-moblin
# telepathy IM protocols
telepathy-salut
telepathy-sofiasip
telepathy-gabble
telepathy-farsight
telepathy-butterfly
# Some useful gnome tools
cheese
nautilus
# display managers
gdm
%end
%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
# Set up auto-login for for liveuser
cat >> /etc/gdm/custom.conf << FOE
[daemon]
AutomaticLoginEnable=true
AutomaticLogin=liveuser
FOE
# Set the Moblin icon/cursor/gtk theme
cat > /etc/gtk-2.0/gtkrc << FOE
gtk-theme-name = "Moblin-Netbook"
gtk-icon-theme-name = "moblin"
gtk-cursor-theme-name = "moblin"
gtk-button-images = 0
gtk-menu-images = 0
FOE
# Add favourite apps to MyZone
mkdir -p /etc/skel/.local/share/
cat > /etc/skel/.local/share/favourite-apps << FOE
file:///usr/share/applications/moblin-app-installer.desktop file:///usr/share/applications/anjal.desktop file:///usr/share/applications/firefox.desktop file:///usr/share
/applications/fedora-empathy.desktop file:///usr/share/applications/hornsey.desktop file:///usr/share/applications/fedora-dates.desktop file:///usr/share/applications/fedora-con
tacts.desktop file:///usr/share/applications/fedora-tasks.desktop
FOE
cat >> /etc/init.d/livesys << FOE
# Add the moblin favourite icons
mkdir -p /home/liveuser/.local/share/
cp /etc/skel/.local/share/favourite-apps /home/liveuser/.local/share/
FOE
# Turn off PackageKit-command-not-found while uninstalled
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
EOF
%end