From 1a224d7e84f98bdabb5078f5f0985af9e5a397ab Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Dec 01 2015 20:20:14 +0000 Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts --- diff --git a/Makefile b/Makefile index c1f57d1..4cfb865 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,8 @@ install: install -m 644 custom/* $(DATADIR)/$(name)/custom mkdir -p -m 755 $(DATADIR)/$(name)/l10n install -m 644 l10n/* $(DATADIR)/$(name)/l10n + mkdir -p -m 755 $(DATADIR)/$(name)/snippets + install -m 644 snippets/* $(DATADIR)/$(name)/snippets clean: rm -f $(name)-*.tar.gz diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index e0a7537..a64b980 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -7,7 +7,7 @@ firewall --enabled --service=mdns,ssh # configure extlinux bootloader bootloader extlinux -part /boot --size=300 --fstype ext3 +part /boot --size=512 --fstype ext4 part swap --size=512 --fstype swap part / --size=3000 --fstype ext4 diff --git a/fedora-arm-minimal.ks b/fedora-arm-minimal.ks index afd7d9b..b98d7db 100644 --- a/fedora-arm-minimal.ks +++ b/fedora-arm-minimal.ks @@ -1,5 +1,6 @@ %include fedora-arm-base.ks +part /boot --size=512 --fstype ext4 part swap --size=256 --fstype swap part / --size=1200 --fstype ext4 diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index 93cfbf5..4990a43 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -35,6 +35,7 @@ rootfiles vim-minimal dnf dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 +sssd-client #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740 -kernel diff --git a/fedora-install-server.ks b/fedora-install-server.ks index 61fcb73..5dd29c1 100644 --- a/fedora-install-server.ks +++ b/fedora-install-server.ks @@ -115,6 +115,7 @@ dracut-* @javaenterprise # “uservisible” groups we want to offer +@ansible-node @editors @network-server @system-tools diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 0d38791..fb201d3 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -275,6 +275,15 @@ chmod 755 /etc/rc.d/init.d/livesys-late # enable tmpfs for /tmp systemctl enable tmp.mount +# As livecd-creator is still yum based, we only get yum's yumdb during the +# image compose. Migrate this over to dnf so that dnf and PackageKit can keep +# track where packages came from. +if [ ! -d /var/lib/dnf ]; then + mkdir -p /var/lib/dnf + mv /var/lib/yum/yumdb /var/lib/dnf/ + rm -rf /var/lib/yum/ +fi + # make it so that we don't do writing to the overlay for things which # are just tmpdirs/caches # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475 @@ -304,12 +313,6 @@ rm -f /core* # convince readahead not to collect # FIXME: for systemd -# forcibly regenerate fontconfig cache (so long as this live image has -# fontconfig) - see #1169979 -if [ -x /usr/bin/fc-cache ] ; then - fc-cache -f -fi - echo 'File created by kickstart. See systemd-update-done.service(8).' \ | tee /etc/.updated >/var/.updated diff --git a/fedora-live-games.ks b/fedora-live-games.ks index aaff586..1ae3f75 100644 --- a/fedora-live-games.ks +++ b/fedora-live-games.ks @@ -35,13 +35,13 @@ armacycles-ad asc asc-music astromenace -beneath-a-steel-sky-cd +# beneath-a-steel-sky-cd scummvm games cut for size boswars btanks bzflag crossfire-client extremetuxracer -flight-of-the-amazon-queen-cd +# flight-of-the-amazon-queen-cd scummvm games cut for size freeciv freecol freedoom @@ -91,7 +91,7 @@ lbrickbuster2 # liquidwar # Would pull in fluid-soundfont-lite-patches londonlaw lordsawar -lure +# lure scummvm games cut for size # machineball # Would pull in fluid-soundfont-lite-patches nethack openlierox diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks index 611b2e0..4819a2f 100644 --- a/fedora-live-kde-base.ks +++ b/fedora-live-kde-base.ks @@ -58,6 +58,7 @@ AKONADI_EOF # Disable plasma-pk-updates sed -i \ -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \ + /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \ /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop # Disable baloo diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks index a023c09..664ef9e 100644 --- a/fedora-live-mate_compiz.ks +++ b/fedora-live-mate_compiz.ks @@ -79,7 +79,4 @@ chown -R liveuser:liveuser /home/liveuser/ restorecon -R /home/liveuser/ EOF -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - %end diff --git a/fedora-live-scientific_kde.ks b/fedora-live-scientific_kde.ks index 893f34b..bb03d07 100644 --- a/fedora-live-scientific_kde.ks +++ b/fedora-live-scientific_kde.ks @@ -88,6 +88,10 @@ rkward # GUI for Octave qtoctave +# julia +julia +julia-doc + # IDEs for the IDE folks @eclipse spyder @@ -153,8 +157,8 @@ xzgv gimp ggobi ggobi-devel -g3data -Mayavi +#g3data +#Mayavi #Misc. Utils screen diff --git a/fedora-live-security.ks b/fedora-live-security.ks index 279b837..87f682b 100644 --- a/fedora-live-security.ks +++ b/fedora-live-security.ks @@ -94,9 +94,6 @@ gnome-keyring-pam %post # xfce configuration -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/livesys << EOF diff --git a/fedora-live-xfce.ks b/fedora-live-xfce.ks index b2302ea..e50aeae 100644 --- a/fedora-live-xfce.ks +++ b/fedora-live-xfce.ks @@ -16,9 +16,6 @@ %post # xfce configuration -# This is a huge file and things work ok without it -rm -f /usr/share/icons/HighContrast/icon-theme.cache - # create /etc/sysconfig/desktop (needed for installation) cat > /etc/sysconfig/desktop <> /etc/rc.d/init.d/fedora-live << EOF -chown -R fedora:fedora /home/fedora -sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf -if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then - cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face - chown fedora:fedora /home/fedora/.face - # TODO: would be nice to get e-d-s to pick this one up too... but how? -fi -EOF - diff --git a/snippets/autologin-kdm.ks b/snippets/autologin-kdm.ks deleted file mode 100644 index d19b42a..0000000 --- a/snippets/autologin-kdm.ks +++ /dev/null @@ -1,33 +0,0 @@ -# %post modifications for kdm and kde - -# add initscript -cat >> /etc/rc.d/init.d/fedora-live << 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/fedora/.xsession -chmod a+x /home/fedora/.xsession -chown fedora:fedora /home/fedora/.xsession - -# set up autologin for user fedora -sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc -sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /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=fedora/' /etc/kde/kdm/kdmrc - -# add liveinst.desktop to favorites menu -mkdir -p /home/fedora/.kde/share/config/ -cat > /home/fedora/.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 -chown -R fedora:fedora /home/fedora/.kde/ -EOF - diff --git a/snippets/config-developer.ks b/snippets/config-developer.ks deleted file mode 100644 index e1b6e3f..0000000 --- a/snippets/config-developer.ks +++ /dev/null @@ -1,7 +0,0 @@ -# %post modifications to add link to demonstration videos to desktop - -cat >> /etc/rc.d/init.d/fedora-live << EOF -pushd /home/fedora/Desktop -ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos" -popd -EOF diff --git a/snippets/config-electronic-lab.ks b/snippets/config-electronic-lab.ks deleted file mode 100644 index 2c2c937..0000000 --- a/snippets/config-electronic-lab.ks +++ /dev/null @@ -1,57 +0,0 @@ -# %post modifications specifically for 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/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 diff --git a/snippets/config-tracker.ks b/snippets/config-tracker.ks deleted file mode 100644 index d65ed43..0000000 --- a/snippets/config-tracker.ks +++ /dev/null @@ -1,16 +0,0 @@ -# %post modifications to configure tracker search - -mkdir -p /home/fedora/.config/tracker - -cat > /home/fedora/.config/tracker/tracker.cfg < /root/.config/tracker/tracker.cfg < /etc/acpi/actions/hotkeys.sh << EOHOTKEY -#!/bin/bash - -export DISPLAY=:0 - -case "$3" in - - #Fn+F2 - 00000010) - # Wlan On - /etc/acpi/actions/wlan.sh poweron - ;; - 00000011) - # Wlan Off - /etc/acpi/actions/wlan.sh poweroff - ;; - - #Fn+F6 - 00000012) - # Webcam switch - /etc/acpi/actions/camera.sh - # TaskManager - # /usr/bin/gnome-system-monitor - ;; - - #Fn+F7 - 00000013) - # Volume mute - /usr/bin/amixer set -D hw:0 Master toggle - ;; - - #Fn+F8 - 00000014) - # Volume down - /usr/bin/amixer set -D hw:0 Master 10%- unmute - ;; - - #Fn+F9 - 00000015) - # Volume up - /usr/bin/amixer set -D hw:0 Master 10%+ unmute - ;; - - #Fn+F5 - 00000030) - - /usr/bin/xrandr --output VGA --mode 1024x768 \ - --output LVDS --off - - if [[ "$?" != "0" ]]; then - - /usr/bin/xrandr --output VGA --preferred \ - --output LVDS --off - - fi - ;; - - 00000031) - - /usr/bin/xrandr --output LVDS --mode 800x480 \ - --output VGA --mode 800x600 - - ;; - - 00000032) - - /usr/bin/xrandr --output VGA --off \ - --output LVDS --preferred - - ;; - *) - logger "ACPI hotkey $3 action is not defined" - ;; -esac -EOHOTKEY - -###### WLAN ############################################################# -cat > /etc/acpi/actions/wlan.sh << EOF -#!/bin/bash - -PWR=$(cat /sys/devices/platform/eeepc/wlan) - -UnloadModules() { - rmmod ath_pci - rmmod ath_rate_sample - rmmod wlan_scan_sta - rmmod wlan_tkip - rmmod wlan_wep - rmmod wlan -} - -LoadModules() { - modprobe ath_pci -} - -case $1 in - poweron) - if [[ "$PWR" = "0" ]]; then - modprobe pciehp pciehp_force=1 - - echo 1 > /sys/devices/platform/eeepc/wlan - - rmmod pciehp - - fi - ;; - - poweroff) - if [[ "$PWR" = "1" ]]; then - - modprobe pciehp pciehp_force=1 - - ifconfig ath0 down - - wlanconfig ath0 destroy - - UnloadModules - - echo 0 > /sys/devices/platform/eeepc/wlan - - rmmod pciehp - - fi - ;; -esac -EOF - -###### Webcam ############################################################# -cat > /etc/acpi/actions/camera.sh << EOF - -#!/bin/bash - -CAMERA=$(cat /sys/devices/platform/eeepc/camera) - - if [[ "$CAMERA" = "0" ]]; then - echo 1 > /sys/devices/platform/eeepc/camera - else - echo 0 > /sys/devices/platform/eeepc/camera - fi -EOF - -chmod +x "/etc/acpi/actions/*" - -###### Shutdown fix ######################################################### -echo "modprobe -r snd-hda-intel" >> /sbin/halt.local -chmod 755 /sbin/halt.local - -###### Gnome display stuff ################################################## - -gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8" -gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8" -gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8" -gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8" -gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8" -gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "F11" -gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons" -gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]" -gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0 -gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0 -gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19 -gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19 diff --git a/snippets/packagekit-cached-metadata.ks b/snippets/packagekit-cached-metadata.ks new file mode 100644 index 0000000..af206b0 --- /dev/null +++ b/snippets/packagekit-cached-metadata.ks @@ -0,0 +1,53 @@ +# %post script to include initial metadata for PackageKit + +%post --nochroot +# Copy over files needed for networking inside the chroot +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart +done +%end + +%post + +# Use host machine's resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + test -f $f && mv $f $f.orig + test -f $f.kickstart && mv -f $f.kickstart $f +done + +PK_PREFIX=`mktemp -d` +mkdir -p $PK_PREFIX/etc/yum.repos.d +if [ -f /etc/yum.repos.d/fedora.repo ] ; then + cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then + cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo +fi +if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then + cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo +fi +if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then + cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ + sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \ + $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo +fi +rpm --root=$PK_PREFIX --initdb +DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh +if [ -d /var/cache/PackageKit ] ; then + mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/ +fi +rm -rf $PK_PREFIX + +# Restore original resolv.conf and hosts files +for f in /etc/resolv.conf /etc/hosts ; do + rm -f $f + test -f $f.orig && mv $f.orig $f +done + +%end diff --git a/snippets/repository-debuginfo.ks b/snippets/repository-debuginfo.ks deleted file mode 100644 index cb246a6..0000000 --- a/snippets/repository-debuginfo.ks +++ /dev/null @@ -1,25 +0,0 @@ -# %post modifications to enable debuginfo repository - -awk ' -BEGIN { - debuginfo = 0 -} - /^\[.*\]/ { - if (/debuginfo/) { - debuginfo = 1 - } else { - debuginfo = 0 - } - print - next -} - /enabled=0/ && debuginfo { - print "enabled=1" - next -} -{ - print - next -}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp -mv /etc/yum.repos.d/fedora.repo{.tmp,} - diff --git a/snippets/screensaver-gnome.ks b/snippets/screensaver-gnome.ks deleted file mode 100644 index f13c84a..0000000 --- a/snippets/screensaver-gnome.ks +++ /dev/null @@ -1,5 +0,0 @@ -# %post modifications to disable GNOME screensaver locking - -cat >> /etc/rc.d/init.d/fedora-live << EOF -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null -EOF diff --git a/snippets/screensaver-kde.ks b/snippets/screensaver-kde.ks deleted file mode 100644 index 17928d4..0000000 --- a/snippets/screensaver-kde.ks +++ /dev/null @@ -1,3 +0,0 @@ -# %post modifications to disable KDE screensaver - -sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc diff --git a/snippets/sysconfig-kde.ks b/snippets/sysconfig-kde.ks deleted file mode 100644 index dfe857e..0000000 --- a/snippets/sysconfig-kde.ks +++ /dev/null @@ -1,6 +0,0 @@ -# %post modifications to create /etc/sysconfig/desktop for KDE - -cat > /etc/sysconfig/desktop < /etc/sysconfig/desktop <