diff --git a/fedora-live-base.ks b/fedora-live-base.ks index d476c1e..2f93845 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -161,7 +161,7 @@ mountPersistentHome() { fi # if it's encrypted, we need to unlock it - if [ "\$(/lib/udev/vol_id -t \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then + if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then echo echo "Setting up encrypted /home device" plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome" diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks index ed57ff0..58d1b88 100644 --- a/fedora-livecd-desktop.ks +++ b/fedora-livecd-desktop.ks @@ -26,13 +26,14 @@ festvox-slt-arctic-hts # dictionaries are big -aspell-* -hunspell-* --man-pages-* +-man-pages* -words # save some space -gnome-user-docs -gimp-help -gimp-help-browser +-gimp-data-extras -evolution-help -gnome-games -gnome-games-help @@ -44,11 +45,21 @@ festvox-slt-arctic-hts -evince-djvu # not needed for gnome -acpid +-wget # these pull in excessive dependencies -ekiga -tomboy -f-spot + +# drop some system-config things +-system-config-boot +-system-config-language +-system-config-lvm +-system-config-network +-system-config-rootpassword +-system-config-services +-policycoreutils-gui %end %post diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks index ff7c743..0174cbb 100644 --- a/fedora-livecd-kde.ks +++ b/fedora-livecd-kde.ks @@ -37,7 +37,6 @@ koffice-kpresenter # ~3 megs koffice-filters kdeartwork # only include some parts of kdeartwork k3b -filelight # ~400kb #twinkle # (~10 megs) fuse liveusb-creator @@ -46,10 +45,6 @@ liveusb-creator ### fixes and space issues -# make kpackagekit the default on the kde live images -kpackagekit --gnome-packagekit - # use system-config-printer-kde instead of system-config-printer -system-config-printer system-config-printer-kde diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 63855a0..db6d5a3 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -7,6 +7,7 @@ # - Rahul Sundaram # - Christoph Wickert # - Kevin Fenzi +# - Adam Miller %include fedora-live-base.ks @@ -18,6 +19,9 @@ NetworkManager-openvpn NetworkManager-gnome NetworkManager-pptp +# Add the midori browser as a lighter alternative +midori + cheese # we don't include @office so that we don't get OOo. but some nice bits @@ -46,8 +50,7 @@ totem totem-mozplugin pidgin claws-mail -# brasero has more dependencies -gnomebaker +xfburn liferea quodlibet gftp @@ -57,9 +60,10 @@ tracker-search-tool xfce4-power-manager seahorse +rtorrent transmission cups-pdf -bluez-gnome +gnome-bluetooth alsa-plugins-pulseaudio pavucontrol @@ -73,33 +77,47 @@ yum-utils # xfce packages @xfce-desktop +Terminal gtk-xfce-engine orage thunar-volman +thunar-media-tags-plugin gigolo xarchiver xfce4-battery-plugin +# we already have thunar-volman +#xfce4-cddrive-plugin +xfce4-cellmodem-plugin xfce4-clipman-plugin xfce4-cpugraph-plugin xfce4-datetime-plugin xfce4-dict-plugin xfce4-diskperf-plugin +xfce4-eyes-plugin +xfce4-fsguard-plugin xfce4-genmon-plugin +xfce4-mailwatch-plugin xfce4-mount-plugin xfce4-netload-plugin xfce4-notes-plugin xfce4-places-plugin xfce4-quicklauncher-plugin +xfce4-smartbookmark-plugin xfce4-screenshooter-plugin xfce4-sensors-plugin xfce4-systemload-plugin xfce4-taskmanager -xfce4-volstatus-icon +xfce4-time-out-plugin +xfce4-timer-plugin xfce4-verve-plugin +xfce4-volstatus-icon +# we already have nm-applet +#xfce4-wavelan-plugin xfce4-weather-plugin xfce4-websearch-plugin # this one a compatibility layer for GNOME applets and depends on it #xfce4-xfapplet-plugin +xfce4-xkb-plugin xfwm4-themes # dictionaries are big diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks index 769af89..d64782f 100644 --- a/fedora-livedvd-electronic-lab.ks +++ b/fedora-livedvd-electronic-lab.ks @@ -4,7 +4,7 @@ # - Chitlesh Goorah # - Thibault North -%include fedora-livecd-kde.ks +%include fedora-livecd-desktop.ks # DVD payload part / --size=8192 @@ -15,33 +15,15 @@ part / --size=8192 # Embedded design -eclipse-cdt +make eclipse-cdt-sdk +#eclipse-eclox eclipse-egit eclipse-epic -eclipse-rcp eclipse-subclipse -doxygen +#eclipse-texlipse splint -# KDE basic packages -kdesvn -kdesdk -yakuake -kdebluetooth - - -# removing useless application from KDE ks --kdegames --koffice-kword --koffice-kspread --koffice-kpresenter --koffice-filters --kdeedu-kstars - -# some projects based on ghdl and gtkwave needs -zlib-devel - # Office dia @@ -52,20 +34,10 @@ openoffice.org-writer2latex openoffice.org-calc openoffice.org-impress openoffice.org-extendedPDF -openoffice.org-ooolatex -kile -tetex-IEEEtran planner graphviz -# some other extra packages -firefox -make -wget -tkcvs - - # debugging tools gdb valgrind @@ -75,60 +47,21 @@ qemu # EDA/CAD department -db4-cxx -db4-tcl perl-Test-Pod perl-Test-Pod-Coverage -# Extra support for compiling SystemC (not fedora compatible) -compat-gcc-34-c++ +# Removing unnecessary packages from the desktop spin +-abiword +-@games +-gimp +-gimp-libs +-gimp-data-extras +-kdebluetooth %end %post -###### Fedora Electronic Lab #################################################### - -# Fedora Electronic Lab: - -cat >> /etc/rc.d/init.d/livesys << EOF - -# kill stupid klipper -cat > /home/liveuser/.kde/share/config/klipperrc < /home/liveuser/.kde/share/config/kxkbrc << KXKBRC_EOF -[Layout] -DisplayNames=us,ch,de,fr -IndicatorOnly=false -LayoutList=us,ch,de,fr -Model=pc104 -Options= -ResetOldOptions=true -ShowFlag=true -ShowSingle=true -SwitchMode=Global -Use=true -KXKBRC_EOF - -chown liveuser:liveuser /home/liveuser/.kde/share/config/kxkbrc - -# Chitlesh doesn't like the KDE icon on the kicker, but fedora's -# icon taken from fedora-logos and applied by kde-settings - -# FEL doesn't need these and boots slowly -/sbin/chkconfig sendmail off 2>/dev/null -/sbin/chkconfig nfs off 2>/dev/null -/sbin/chkconfig nfslock off 2>/dev/null -/sbin/chkconfig rpcidmapd off 2>/dev/null -/sbin/chkconfig rpcbind off 2>/dev/null - -EOF - %end diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks index cded925..81f446a 100644 --- a/fedora-livedvd-games.ks +++ b/fedora-livedvd-games.ks @@ -75,6 +75,7 @@ blobwars bombardier cdogs-sdl clanbomber +colossus foobillard glaxium gnubg