Merge branch 'f23' of ssh://git.fedorahosted.org/git/spin-kickstarts into f23
This commit is contained in:
Luya Tshimbalanga
commit
5fe8408f5c
|
|
@ -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 'http://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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ rootpw vagrant
|
|||
# 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" --extlinux
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
|
||||
|
||||
%packages
|
||||
# The default koji Vagrantfile configuration uses rsync to sync files between
|
||||
|
|
|
|||
|
|
@ -52,7 +52,12 @@ reboot
|
|||
# Package list.
|
||||
# FIXME: instLangs does not work, so there's a hack below
|
||||
# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
|
||||
%packages --instLangs=en
|
||||
# FIXME: instLangs bug has been fixed but now having instLangs
|
||||
# with an arg causes no langs to get installed because of BZ1262040
|
||||
# which yields the errors in BZ1261249. For now fix by not using
|
||||
# --instLangs at all
|
||||
#%packages --instLangs=en
|
||||
%packages
|
||||
|
||||
kernel-core
|
||||
@^cloud-server-environment
|
||||
|
|
@ -113,8 +118,9 @@ echo .
|
|||
|
||||
# this is installed by default but we don't need it in virt
|
||||
# Commenting out the following for #1234504
|
||||
#echo "Removing linux-firmware package."
|
||||
#dnf -C -y erase linux-firmware
|
||||
# rpm works just fine for removing this, no idea why dnf can't cope
|
||||
echo "Removing linux-firmware package."
|
||||
rpm -e linux-firmware
|
||||
|
||||
# Remove firewalld; was supposed to be optional in F18+, but is pulled in
|
||||
# in install/image building.
|
||||
|
|
|
|||
|
|
@ -108,8 +108,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
|
|||
echo .
|
||||
|
||||
# this is installed by default but we don't need it in virt
|
||||
# Commenting out the following for #1234504
|
||||
# rpm works just fine for removing this, no idea why dnf can't cope
|
||||
echo "Removing linux-firmware package."
|
||||
yum -C -y remove linux-firmware
|
||||
rpm -e linux-firmware
|
||||
|
||||
# Remove firewalld; was supposed to be optional in F18+, but is required to
|
||||
# be present for install/image building.
|
||||
|
|
|
|||
|
|
@ -99,8 +99,10 @@ ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
|
|||
echo .
|
||||
|
||||
# this is installed by default but we don't need it in virt
|
||||
# Commenting out the following for #1234504
|
||||
# rpm works just fine for removing this, no idea why dnf can't cope
|
||||
echo "Removing linux-firmware package."
|
||||
yum -C -y remove linux-firmware
|
||||
rpm -e linux-firmware
|
||||
|
||||
# Remove firewalld; was supposed to be optional in F18+, but is required to
|
||||
# be present for install/image building.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ selinux --enforcing
|
|||
firewall --enabled --service=mdns
|
||||
xconfig --startxonboot
|
||||
part / --size 4096 --fstype ext4
|
||||
services --enabled=NetworkManager --disabled=network,sshd
|
||||
services --enabled=NetworkManager,ModemManager --disabled=network,sshd
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ part / --size 10240
|
|||
# will likely put the games spin over size and it is freeze time.
|
||||
-libreoffice*
|
||||
|
||||
# Extra screensavers isn't much help for the games spin
|
||||
xscreensaver-extras
|
||||
|
||||
# Allow joysticks and game pads to work
|
||||
joystick-support
|
||||
|
||||
|
|
@ -150,7 +153,7 @@ pingus
|
|||
# puzzles (small)
|
||||
|
||||
escape
|
||||
gbrainy
|
||||
# gbrainy Removed for space - only game that pulls in mono
|
||||
magicor
|
||||
mirrormagic
|
||||
pipenightdreams
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ jack-audio-connection-kit
|
|||
jack-audio-connection-kit-dbus
|
||||
qjackctl
|
||||
jackctlmmc
|
||||
ffado
|
||||
|
||||
#pulse
|
||||
pulseaudio-module-jack
|
||||
|
|
|
|||
|
|
@ -7,12 +7,6 @@
|
|||
|
||||
%post
|
||||
|
||||
# create /etc/sysconfig/desktop (needed for installation)
|
||||
cat > /etc/sysconfig/desktop <<EOF
|
||||
DESKTOP="KDE"
|
||||
DISPLAYMANAGER="KDE"
|
||||
EOF
|
||||
|
||||
# set default GTK+ theme for root (see #683855, #689070, #808062)
|
||||
cat > /root/.gtkrc-2.0 << EOF
|
||||
include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
|
||||
|
|
@ -28,17 +22,6 @@ EOF
|
|||
# add initscript
|
||||
cat >> /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 liveuser use KDE
|
||||
echo "startkde" > /home/liveuser/.xsession
|
||||
chmod a+x /home/liveuser/.xsession
|
||||
chown liveuser:liveuser /home/liveuser/.xsession
|
||||
|
||||
# set up autologin for user liveuser
|
||||
if [ -f /etc/sddm.conf ]; then
|
||||
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
|
||||
|
|
@ -55,23 +38,15 @@ fi
|
|||
mkdir -p /home/liveuser/.config/
|
||||
cat > /home/liveuser/.config/kickoffrc << MENU_EOF
|
||||
[Favorites]
|
||||
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
|
||||
FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
|
||||
MENU_EOF
|
||||
|
||||
# show liveinst.desktop on desktop and in menu
|
||||
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
|
||||
|
||||
# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
|
||||
# set executable bit disable KDE security warning
|
||||
chmod +x /usr/share/applications/liveinst.desktop
|
||||
|
||||
# copy over the icons for liveinst to hicolor
|
||||
cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
|
||||
cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
|
||||
cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
|
||||
cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
|
||||
cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
|
||||
cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
|
||||
touch /usr/share/icons/hicolor/
|
||||
mkdir /home/liveuser/Desktop
|
||||
cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
|
||||
|
||||
# Set akonadi backend
|
||||
mkdir -p /home/liveuser/.config/akonadi
|
||||
|
|
@ -97,6 +72,12 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
|
|||
Enabled=false
|
||||
KRES_EOF
|
||||
|
||||
# Disable kwallet migrator
|
||||
cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
|
||||
[Migration]
|
||||
alreadyMigrated=true
|
||||
KWALLET_EOL
|
||||
|
||||
# make sure to set the right permissions and selinux contexts
|
||||
chown -R liveuser:liveuser /home/liveuser/
|
||||
restorecon -R /home/liveuser/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -110,8 +110,6 @@ pdfshuffler
|
|||
openmpi
|
||||
openmpi-devel
|
||||
valgrind-openmpi
|
||||
pvm
|
||||
pvm-gui #will install 'pvm' as well
|
||||
libgomp
|
||||
python-pp
|
||||
mpi4py-openmpi
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ fusion-icon-gtk
|
|||
blueman
|
||||
|
||||
# some apps from mate-applications
|
||||
caja-actions
|
||||
# caja-actions
|
||||
mate-disk-usage-analyzer
|
||||
mate-netspeed
|
||||
|
||||
# more backgrounds
|
||||
f23-backgrounds-base
|
||||
f23-backgrounds-mate
|
||||
f21-backgrounds-extras-base
|
||||
f23-backgrounds-extras-base
|
||||
|
||||
# system tools
|
||||
system-config-printer
|
||||
|
|
|
|||
Loading…
Reference in New Issue