From 684f924a724ae5cd13ae6043ee32bc651e60af24 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Fedora Unity)" Date: Tue, 28 Oct 2008 13:38:39 +0100 Subject: [PATCH] There is no Electronic Lab LiveCD anymore, make the changes Sort the Makefile to list the actual spin first, then it's localizations --- Makefile.am | 16 +- fedora-livecd-electronic-lab.ks | 240 ------------------ ... => fedora-livedvd-electronic-lab-de_CH.ks | 2 +- ... => fedora-livedvd-electronic-lab-nl_NL.ks | 2 +- ... => fedora-livedvd-electronic-lab-pt_PT.ks | 2 +- 5 files changed, 12 insertions(+), 250 deletions(-) delete mode 100644 fedora-livecd-electronic-lab.ks rename fedora-livecd-electronic-lab-de_CH.ks => fedora-livedvd-electronic-lab-de_CH.ks (82%) rename fedora-livecd-electronic-lab-nl_NL.ks => fedora-livedvd-electronic-lab-nl_NL.ks (82%) rename fedora-livecd-electronic-lab-pt_PT.ks => fedora-livedvd-electronic-lab-pt_PT.ks (78%) diff --git a/Makefile.am b/Makefile.am index bd13d23..5c9561b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,28 +4,30 @@ kickstartdir = $(pkgdatadir)/ kickstart_DATA = \ fedora-aos.ks \ fedora-live-base.ks \ - fedora-livecd-desktop-de_DE.ks \ - fedora-livecd-desktop-default.ks \ - fedora-livecd-desktop-en_US.ks \ fedora-livecd-desktop.ks \ + fedora-livecd-desktop-default.ks \ + fedora-livecd-desktop-de_DE.ks \ + fedora-livecd-desktop-en_US.ks \ fedora-livecd-desktop-nl_NL.ks \ fedora-livecd-desktop-pt_BR.ks \ fedora-livecd-desktop-pt_PT.ks \ fedora-livecd-education-math.ks \ - fedora-livecd-electronic-lab.ks \ - fedora-livecd-electronic-lab-nl_NL.ks \ - fedora-livecd-electronic-lab-pt_PT.ks \ - fedora-livecd-kde-de_DE.ks \ fedora-livecd-kde.ks \ + fedora-livecd-kde-de_CH.ks \ + fedora-livecd-kde-de_DE.ks \ fedora-livecd-kde-nl_NL.ks \ fedora-livecd-kde-pt_PT.ks \ fedora-livecd-xfce.ks \ + fedora-livecd-xfce-de_CH.ks \ fedora-livecd-xfce-nl_NL.ks \ fedora-livecd-xfce-pt_PT.ks \ fedora-livedvd-developer.ks \ fedora-livedvd-developer-nl_NL.ks \ fedora-livedvd-developer-pt_PT.ks \ fedora-livedvd-electronic-lab.ks \ + fedora-livedvd-electronic-lab-de_CH.ks \ + fedora-livedvd-electronic-lab-nl_NL.ks \ + fedora-livedvd-electronic-lab-pt_PT.ks \ fedora-livedvd-games.ks \ fedora-livedvd-games-nl_NL.ks \ fedora-livedvd-games-pt_PT.ks diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks deleted file mode 100644 index 5b15e45..0000000 --- a/fedora-livecd-electronic-lab.ks +++ /dev/null @@ -1,240 +0,0 @@ -# fedora-livecd-electronic-lab.ks -# -# Maintainer(s): -# - Chitlesh Goorah -# - Tibaut North - -%include fedora-live-base.ks - -%packages -# KDE basic packages -kdebase -kde-filesystem -kdelibs -kdenetwork -kdegraphics -kdeutils -kde-settings -kmenu-gnome -kdesvn -yakuake -# include default fedora wallpaper -desktop-backgrounds-basic -wget - -# some projects based on ghdl and gtkwave needs -zlib-devel - -#project management -vym -koffice-kspread -koffice-kword -koffice-kplato -koffice-filters - -# some other extra packages -ntfsprogs -ntfs-3g -synaptics -setroubleshoot -smolt -smolt-firstboot -syslinux -gnupg -hal-cups-utils - -# we don't want these --dos2unix --firefox --authconfig-gtk --PolicyKit-gnome --gnome-doc-utils-stylesheets - -# ignore comps.xml and make sure these packages are included -kpowersave -rhgb - - -#vlsi -alliance-doc -irsim -gds2pov -magic-doc -toped -xcircuit -qucs -netgen - -#Hardware Description Languages -gtkwave -iverilog -drawtiming -ghdl -freehdl - -#spice -ngspice -gnucap -#gspiceui -#gwave - -#PCB and schematics -geda-gschem -geda-examples -geda-gsymcheck -geda-gattrib -geda-utils -geda-docs -geda-gnetlist -gerbv -gresistor -kicad -pcb - -#Micro Programming -piklab -ktechlab -pikloops -sdcc - -# Serial Port Terminals -gtkterm -picocom -minicom - -#embedded -arm-gp2x-linux* -avr-* -avrdude -dfu-programmer -avarice -uisp - -#computing -octave -octave-forge - -%end - -%post - -###### Fedora Electronic Lab #################################################### - -# Fedora Electronic Lab: Kwin buttons -cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc < /usr/share/kde-settings/kde-profile/default/share/config/klipperrc < /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc < /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc < /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 fedora user use KDE -echo "startkde" > /home/liveuser/.xsession -chmod a+x /home/liveuser/.xsession -chown liveuser:liveuser /home/liveuser/.xsession - -# set up autologin for user fedora -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 fedora 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 - -# disable screensaver -sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc - -# workaround to put liveinst on desktop and in menu -sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -EOF - -# and set up gnome-keyring to startup/shutdown in kde -mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown -cat > /etc/skel/.kde/env/start-custom.sh << EOF -#!/bin/sh -eval \`gnome-keyring-daemon\` -export GNOME_KEYRING_PID -export GNOME_KEYRING_SOCKET -EOF -chmod 755 /etc/skel/.kde/env/start-custom.sh - -cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF -#/bin/sh -if [-n "$GNOME_KEYRING_PID"]; then - kill $GNOME_KEYRING_PID -fi -EOF - -chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh - -###### Fedora Electronic Lab #################################################### - -# FEL doesn't need these and boots slowly -/sbin/chkconfig anacron off -/sbin/chkconfig sendmail off -/sbin/chkconfig nfs off -/sbin/chkconfig nfslock off -/sbin/chkconfig rpcidmapd off -/sbin/chkconfig rpcbind off - -%end - diff --git a/fedora-livecd-electronic-lab-de_CH.ks b/fedora-livedvd-electronic-lab-de_CH.ks similarity index 82% rename from fedora-livecd-electronic-lab-de_CH.ks rename to fedora-livedvd-electronic-lab-de_CH.ks index a2456f6..b161006 100644 --- a/fedora-livecd-electronic-lab-de_CH.ks +++ b/fedora-livedvd-electronic-lab-de_CH.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Fabian Affolter -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang de_DE keyboard sg-latin1 diff --git a/fedora-livecd-electronic-lab-nl_NL.ks b/fedora-livedvd-electronic-lab-nl_NL.ks similarity index 82% rename from fedora-livecd-electronic-lab-nl_NL.ks rename to fedora-livedvd-electronic-lab-nl_NL.ks index c623ca5..7f9af01 100644 --- a/fedora-livecd-electronic-lab-nl_NL.ks +++ b/fedora-livedvd-electronic-lab-nl_NL.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Jeroen van Meeuwen -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang nl_NL keyboard us diff --git a/fedora-livecd-electronic-lab-pt_PT.ks b/fedora-livedvd-electronic-lab-pt_PT.ks similarity index 78% rename from fedora-livecd-electronic-lab-pt_PT.ks rename to fedora-livedvd-electronic-lab-pt_PT.ks index 823d72c..754a736 100644 --- a/fedora-livecd-electronic-lab-pt_PT.ks +++ b/fedora-livedvd-electronic-lab-pt_PT.ks @@ -3,7 +3,7 @@ # Maintainer(s): # - Pedro Silva -%include fedora-livecd-electronic-lab.ks +%include fedora-livedvd-electronic-lab.ks lang pt_PT.UTF-8 keyboard pt-latin1