fix missing /run/lock in docker base image BZ#1343138

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Mate: clean up fedora-mate-packages.ks
2025-12-09 16:40:30 +08:00 · 2016-07-22 16:05:10 -05:00 · 2016-03-12 00:30:46 +01:00 · 2016-02-19 10:41:07 -05:00 · 2015-12-10 11:10:57 -05:00 · 2015-11-12 11:22:49 -06:00
33 changed files with 418 additions and 63 deletions
--- a/2
+++ b/2
@@ -18,8 +18,6 @@ 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
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'\n%end\n"

--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@@ -17,7 +17,7 @@ shutdown
 services --disabled=docker-storage-setup,network
 services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
 
 %post

--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-cloud-atomic-vagrant.ks
@@ -8,6 +8,13 @@ services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
 user --name=vagrant --password=vagrant
 rootpw vagrant

+# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
+# even on VirtualBox virt, we get a primary network device with "eth0" as the name
+# This simplifies things and allows a single disk image for both supported Vagrant
+# platforms (virtualbox and kvm)
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+
+
 %post --erroronfail

 # Work around cloud-init being both disabled and enabled; need
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -33,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host

 reboot

 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -122,5 +122,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
 %end

--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -36,7 +36,7 @@ user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -77,7 +77,6 @@ kernel-core
 #-kbd
 -uboot-tools
 -kernel
-grub2

 %end

@@ -114,9 +113,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -235,21 +231,12 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*


-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-

 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -1,4 +1,4 @@
-# This is a minimal Fedora install designed to serve as a Docker base image. 
+# This is a minimal Fedora install designed to serve as a Docker base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
@@ -9,9 +9,9 @@
 #
 # To do so, testing local changes, first you'll need a TDL file.  I store one here:
 # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# 
+#
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
-# 
+#
 #   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
 #

@@ -52,17 +52,10 @@ userdel -r none
 LANG="en_US"
 echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf

-# Carry these configs for both dnf and yum for users who are calling
-# yum-deprecated directly. This will keep the experience between both
-# consistent
 awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
    < /etc/yum.conf > /etc/yum.conf.new
 mv /etc/yum.conf.new /etc/yum.conf

-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
-
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
@@ -83,6 +76,10 @@ sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

+# Fix /run/lock breakage since it's not tmpfs in docker
+umount /run
+systemd-tmpfiles --create --boot
+
 rm -f /etc/machine-id

 %end
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation

 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -92,7 +92,6 @@ dracut-*
 # Web Server environment
@haproxy
@mongodb
-@perl-web
@python-web
@php
@rubyonrails
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks

 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server

 %include fedora-workstation-packages.ks

--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -313,6 +313,12 @@ 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

--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>

-%include fedora-live-kde.ks
+%include fedora-livecd-kde.ks

 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -77,7 +77,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour4
+ardour3
 rosegarden4
 seq24
 muse
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -79,4 +79,7 @@ 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
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -21,9 +21,9 @@ part / --size 12288
@engineering-and-scientific

 # scilab
-scilab
-scilab-devel
-scilab-doc
+#scilab
+#scilab-devel
+#scilab-doc

 # sagemath
 # BZ #1006230 should fix this
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -94,6 +94,9 @@ 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 <<EOF
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -51,7 +51,6 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
-org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
@@ -59,7 +58,6 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -10,6 +10,9 @@ part / --size 6144

 %post

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 cat >> /etc/rc.d/init.d/livesys << EOF


--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -16,6 +16,9 @@
 %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 <<EOF
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,5 +1,4 @@
 %packages
-PackageKit*                # we switched to yumex, so we don't need this
 firefox
@mate
 compiz
@@ -15,14 +14,12 @@ ccsm
 emerald-themes
 emerald
 fusion-icon
-fusion-icon-gtk
@networkmanager-submodules
 blueman

 # some apps from mate-applications
-caja-actions
+# caja-actions
 mate-disk-usage-analyzer
-mate-netspeed

 # more backgrounds
 f23-backgrounds-base
@@ -39,15 +36,18 @@ parole
 exaile
 PackageKit-gstreamer-plugin

-# blacklist applications which breaks mate-desktop
-audacious
-
 # office
@libreoffice

 # dsl tools
 rp-pppoe

+# drop packages
+-PackageKit*                # we switched to yumex, so we don't need this
+
+# blacklist applications which breaks mate-desktop
+-audacious
+
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+# %include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -25,10 +25,6 @@ gnome-keyring-pam
 # Note that blank is still default.
 xscreensaver-extras
 wget
-# Handy for debugging
-rfkill
-# Better more popular browser
-firefox
 system-config-printer

 # save some space
--- a/snippets/autologin-gdm.ks
+++ b/snippets/autologin-gdm.ks
@@ -0,0 +1,12 @@
+# %post modifications for gdm
+
+cat >> /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
+
--- a/snippets/autologin-kdm.ks
+++ b/snippets/autologin-kdm.ks
@@ -0,0 +1,33 @@
+# %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
+
--- a/snippets/config-developer.ks
+++ b/snippets/config-developer.ks
@@ -0,0 +1,7 @@
+# %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
--- a/snippets/config-electronic-lab.ks
+++ b/snippets/config-electronic-lab.ks
@@ -0,0 +1,57 @@
+# %post modifications specifically for Fedora Electronic Lab
+
+# Fedora Electronic Lab: Kwin buttons
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
+[Style]
+ButtonsOnLeft=MB
+ButtonsOnRight=FIAX
+CustomButtonPositions=true
+EOF
+
+# kill klipper
+cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+[General]
+AutoStart=false
+EOF
+
+# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
+cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
+[Digital]
+LCD_Style=false
+Show_Date=false
+Show_Seconds=true
+
+[General]
+Type=Digital
+EOF
+
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,fr,jp
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=true
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true
+EOF
+
+# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
+# This is a feature for Fedora and not for KDE
+cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+
+/sbin/chkconfig anacron off
+/sbin/chkconfig sendmail off
+/sbin/chkconfig nfs off
+/sbin/chkconfig nfslock off
+/sbin/chkconfig rpcidmapd off
+/sbin/chkconfig rpcbind off
--- a/snippets/config-kde-gnome-keyring.ks
+++ b/snippets/config-kde-gnome-keyring.ks
@@ -0,0 +1,19 @@
+# %post modifications to set up gnome-keyring 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
--- a/snippets/config-tracker.ks
+++ b/snippets/config-tracker.ks
@@ -0,0 +1,16 @@
+# %post modifications to configure tracker search
+
+mkdir -p /home/fedora/.config/tracker
+
+cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
+
+mkdir -p /root/.config/tracker
+cat > /root/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
--- a/snippets/eeepc900-modifications.ks
+++ b/snippets/eeepc900-modifications.ks
@@ -0,0 +1,164 @@
+###### Eee PC 900 stuff ####################################################
+#
+###### Hotkeys #############################################################
+cat > /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 "<Alt>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
--- a/snippets/repository-debuginfo.ks
+++ b/snippets/repository-debuginfo.ks
@@ -0,0 +1,25 @@
+# %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,}
+
--- a/snippets/screensaver-gnome.ks
+++ b/snippets/screensaver-gnome.ks
@@ -0,0 +1,5 @@
+# %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
--- a/snippets/screensaver-kde.ks
+++ b/snippets/screensaver-kde.ks
@@ -0,0 +1,3 @@
+# %post modifications to disable KDE screensaver
+
+sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
--- a/snippets/sysconfig-kde.ks
+++ b/snippets/sysconfig-kde.ks
@@ -0,0 +1,6 @@
+# %post modifications to create /etc/sysconfig/desktop for KDE
+
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
--- a/snippets/sysconfig-xfce.ks
+++ b/snippets/sysconfig-xfce.ks
@@ -0,0 +1,5 @@
+# %post modifications to create /etc/sysconfig/desktop for XFCE
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
Author	SHA1	Message	Date
Adam Miller	dfde534098	fix missing /run/lock in docker base image BZ#1343138 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2016-07-22 16:05:10 -05:00
raveit65	e1d8fc75bc	Mate: clean up fedora-mate-packages.ks	2016-03-12 00:30:46 +01:00
Jonathan Lebon	6641de0a8b	atomic: add Developer Mode boot menu item This patch is for the spin-kickstarts repository. Call out to the `bootentry` script in the kickstart %post so that the Developer Mode option is added to the GRUB 2 menu.	2016-02-19 10:41:07 -05:00
Dusty Mabe	2878aa0060	Fix f23 vagrant atomic host not having eth0 net device name. Fixes https://fedorahosted.org/cloud/ticket/141	2015-12-10 11:10:57 -05:00
Jan Pazdziora	2d56c91c07	Add sssd-client with .so's for easy integration with SSSD container. (cherry picked from commit `ee22a9c00c`)	2015-11-12 11:22:49 -06:00
Kevin Kofler	d0b28ea2c3	fedora-live-kde-base.ks: Don't shipped cached PackageKit metadata. This effectively reverts the recent change by rdieter, without undoing the refactoring. As per the IRC discussion, it looks like caching the metadata is not all that helpful with Apper or Muon (and I doubt it is actually helpful with ANY frontend, because updates will necessarily be outdated, and even the Everything repo usually changes one last time after the last RC, to officially push packages that the RC took from a side repo), we would only be increasing our spin size with stale metadata.	2015-10-26 19:18:48 +01:00
Bruno Wolff III	95c0f2af6d	Games: needed to save more space Fedora has gotten significantly bigger since we started doing final TCs and even between final RCs. I am not sure why. But this cut will get the Games spin safely under 4 GiB.	2015-10-24 12:09:17 -05:00
Kalev Lember	f46ca3331f	live base: Migrate yum's yumdb over to dnf As livecd-creator is still yum based, we only get yum's yumdb during live image composes. To work this around, this commit adds a %post script to fedora-live-base.ks to migrate yum's yumdb over to dnf. https://bugzilla.redhat.com/show_bug.cgi?id=1274319	2015-10-22 20:10:56 +02:00
Peter Robinson	fdc93b3659	arm: fix up boot partitions	2015-10-21 09:47:44 +01:00
Kalev Lember	0bc399cf58	packagekit-cached-metadata.ks: Set up resolv.conf and hosts files Copy over host system's /etc/resolv.conf and /etc/hosts to make it possible to resolve kojipkgs.fedoraproject.org inside the chroot.	2015-10-20 20:24:09 +02:00
Kalev Lember	b53dfb5ba8	packagekit-cached-metadata.ks: Use http for kojipkgs.fedoraproject.org It turns out that koji builders can't access kojipkgs.fedoraproject.org over https, but plain http works just fine.	2015-10-20 20:19:19 +02:00
Kalev Lember	469ad561b9	Move packagekit-cached-metadata.ks to snippets/ ... and make it a top-level script wrapped in %post ... %end.	2015-10-20 20:17:29 +02:00
Rex Dieter	f5eb0bee5f	split pk cached metadata hack into include'able snippet and add to -kde-base	2015-10-20 11:13:25 -05:00
Rex Dieter	21a379ef79	kde: Plasma session notifies for available updates See also http://bugzilla.redhat.com/1262600	2015-10-20 08:42:43 -05:00
Kalev Lember	e07cfce2f1	workstation: Include cached metadata for PackageKit Instead of taking the metadata from PackageKit-cached-metadata package as we were doing previously, copy it over directly during the compose from https://kojipkgs.fedoraproject.org/mash/ This makes it much less error prone as we always get the very latest metadata, and makes maintenance much simpler as we don't need to roll PackageKit-cached-metadata by hand. Users are also going to appreciate this because it makes post-GA updates smaller as they won't have to download updates for the PackageKit-cached-metadata subpackage each time PackageKit gets updated.	2015-10-19 20:45:58 +02:00
Luya Tshimbalanga	7e607ce0f3	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-18 09:33:07 -07:00
Luya Tshimbalanga	f206dc6253	design-suite: fix typo on f23-backgrounds-extras-base	2015-10-18 09:31:46 -07:00
Matthew Miller	2585bce264	adds kbd,plymouth rpms back. We have had -kbd in the kickstart for a long time, but because of BZ#1199868 it wasn't actually getting excluded. Not having it causes systemd-vconsole-setup.service to fail so we are adding it back for now. Additionally we need to add back plymouth to cover up the subsequent failure of systemd-vconsole-setup.service. See BZ#1272684.	2015-10-17 13:00:12 -04:00
Kushal Das	72774fc6b0	Fixes trac #128 Removes extra ifcfg file.	2015-10-15 13:44:41 +05:30
Luya Tshimbalanga	aa81c7cd0e	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-13 10:39:04 -07:00
Luya Tshimbalanga	5e9291ec1c	design-suite: restore luxrender and add extra wallpapers	2015-10-13 10:38:17 -07:00
Bruno Wolff III	a44b1dc6d3	Games spin: xscreensaver-extras was supposed to get removed	2015-10-13 09:52:38 -05:00
Luya Tshimbalanga	5fe8408f5c	Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23	2015-10-12 21:39:49 -07:00
Bruno Wolff III	6751aa3849	Games spin - cut to get back under 4 GiB	2015-10-12 19:31:30 -05:00
raveit65	6d5b58634a	Mate add f23-backgrounds-extras-base	2015-10-13 00:56:13 +02:00
Rex Dieter	01e4b012f3	kde: drop (deprecated) xsession stuff	2015-09-25 10:09:26 -05:00
Rex Dieter	9b16a9462d	add trailing / , to ensure we copy to dir and not as file	2015-09-25 09:49:16 -05:00
Rex Dieter	2a96952c22	kde: drop kdm reference	2015-09-25 09:20:47 -05:00
Rex Dieter	84557491c8	kde: drop reference to /etc/sysconfig/desktop deprecated long ago	2015-09-25 09:19:43 -05:00
Rex Dieter	1274fda3e7	kde: update default favorites	2015-09-25 09:18:30 -05:00
Rex Dieter	7f133a05ce	drop liveinst icon hack no longer needed, and needlessly invalidates icon cache	2015-09-25 09:14:45 -05:00
Rex Dieter	330c56ad28	explicitly mkdir Desktop dir workaround https://bugzilla.redhat.com/show_bug.cgi?id=1266243	2015-09-25 09:13:35 -05:00
Peter Robinson	7764a782a5	adjust linux-firmware for cloud images	2015-09-23 07:16:42 +01:00
Rex Dieter	0f26c21c8d	disable kwallet migrator	2015-09-21 20:16:48 -05:00
Kushal Das	4d05ed6718	Removes extlinux parameter from bootloader information.	2015-09-15 02:48:58 +05:30
Dusty Mabe	93793acd48	cloud-base: workaround issue where langs are not getting installed. Workaround BZ1262040 by removing the --instLangs arg from the %packages line and rely on our previous hack to manually remove langs after install. This fixes BZ1261249. Signed-off-by: Kushal Das <kushaldas@gmail.com>	2015-09-15 00:10:07 +05:30
Luya Tshimbalanga	27ed383622	design: use https for fpo address	2015-09-10 20:58:29 -07:00
David Ward	d86a3b5d9d	fedora-live-base.ks: enable ModemManager service The ModemManager package is already installed for all live images; it should be enabled so users can connect to WWAN right after boot using the NetworkManager applet. Signed-off-by: David Ward <david.ward@ll.mit.edu>	2015-09-07 10:36:21 -06:00
raveit65	f85ce784f9	Mate-live f23: disable caja-actions for the moment	2015-09-07 09:54:28 +02:00
Kevin Fenzi	73bf1e7ef1	Add ffado to jam spin. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1259053	2015-09-03 09:58:40 -06:00
Colin Walters	1fac51f92e	atomic: Fix references for branched	2015-09-02 17:13:48 -04:00
Colin Walters	60e8bf04f0	cloud-atomic: s/rawhide/23/ on this branch	2015-08-27 16:02:27 -04:00
Amit	2ee3dfa33d	Scientific: Comment out scilab for now.	2015-08-21 23:50:44 +10:00
Amit	6cbd02ead6	scientific: pvm is retired	2015-08-17 22:15:07 +10:00
Luya Tshimbalanga	9e4639836a	design-suite: temporarily removal of luxrender-blender due to broken dependency (rhbz #1253408 )	2015-08-13 09:27:16 -07:00
Dan Book	0790ffabbb	menu items should be excluded by cinnamon now	2015-08-12 14:37:23 -04:00
Rex Dieter	be135f9a7d	kde: +firefox per https://lists.fedoraproject.org/pipermail/kde/2015-August/015363.html	2015-08-11 13:33:08 -05:00
Stephen Gallagher	d90ed68560	Fedora Server: Include @networkmanager-submodules This is needed for optional installations including WiFI or WWAN	2015-08-10 14:24:41 -04:00
raveit65	c51b27294e	Mate: use f23 backgrounds	2015-08-07 16:33:08 +02:00
Dennis Gilmore	fb40fd6d03	do not remove grub2 Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 18:41:39 -05:00
Dennis Gilmore	bc1f075e41	remove the hacks in %post for extlinux Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 16:02:18 -05:00
Dennis Gilmore	932524c849	switch the cloud base image to grub for Alpha Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-08-06 14:32:36 -05:00
Stephen Gallagher	1568248565	Temporarily remove @perl-web group from the DVD This is due to package issues caused by a broken perl-MongoDB package. We will fix it post-alpha and re-add this.	2015-08-05 08:46:06 -04:00
Stephen Gallagher	8453b8352b	Pull in @virtualization-headless instead of @virtualization	2015-08-05 08:45:01 -04:00
raveit65	5a7026e059	Mate: add lightdm-gtk-greeter-settings	2015-07-30 17:27:10 +02:00
Bruno Wolff III	f0a3e2cef0	Remove games that pull in fluid-soundfont-lite-patches fluid-soundfont-lite-patches is 200MB installed and we need some big cuts to get under size again.	2015-07-26 00:46:41 -05:00
Christian Dersch	0c88d07916	Added kickstart file for Astronomy Spin	2015-07-25 20:17:25 +02:00
Bruno Wolff III	86e5787b35	The name of the XFCE ks file changed	2015-07-24 11:39:22 -05:00
Adam Williamson	75b7f9fd28	bump the KDE compose root size a bit KDE composes have been failing for weeks due to insufficient space in the compose root.	2015-07-22 08:42:40 -07:00
raveit65	2e6490e3f4	Mate: remove packagekit packages	2015-07-17 17:28:58 +02:00
Bruno Wolff III	0aafbdc2a2	f23 is no longer rawhide I changed the scripts that clearly stated where rawhide references were to be commented out, but there are some rawhide references in atomic stuff that may or may not need to be changed.	2015-07-15 19:43:04 -05:00