Compare commits
69 Commits
Author | SHA1 | Date |
---|---|---|
Dusty Mabe | 26be0f2d85 | |
Dusty Mabe | 6553b85eba | |
Jonathan Lebon | 015e301b25 | |
Dusty Mabe | e77c443079 | |
Dusty Mabe | 3fd7e8b009 | |
Dusty Mabe | 8909332a6d | |
Thomas Mueller | ee920bfa1f | |
Colin Walters | e11de770d0 | |
Adam Miller | f85bbb10ee | |
Dusty Mabe | 0ef56672f7 | |
raveit65 | 15e9749cd4 | |
Dennis Gilmore | 0933e101c0 | |
Peter Robinson | fc25b45421 | |
Peter Robinson | 25735c97b2 | |
Luya Tshimbalanga | 9c4ea05e32 | |
Christian Dersch | 84cba7aaa0 | |
Christian Dersch | 434aec0dd3 | |
Kamil Páral | d0d81076bb | |
Christian Dersch | 5468763219 | |
Luya Tshimbalanga | 4b020c1d29 | |
Peter Robinson | 965fb1adab | |
Peter Robinson | 7f436214bc | |
Christian Dersch | 8d66af166c | |
Jason Brooks | 6f3661e3a5 | |
Jason Brooks | 5d987e82b3 | |
Kevin Fenzi | 2de79eaadb | |
Adam Williamson | aaaf21e930 | |
Peter Robinson | 73645f341e | |
Luya Tshimbalanga | b2a85a8796 | |
Christian Dersch | f626ce246d | |
Peter Robinson | b41f84a72c | |
Peter Robinson | dceca557c3 | |
Dusty Mabe | e0e0f1f7ee | |
Kevin Fenzi | c4c8c7add1 | |
Peter Robinson | 1f1184c77c | |
Luya Tshimbalanga | 2699e4b6a3 | |
Peter Robinson | 2ac5e77a03 | |
Amit Saha | c901db770b | |
Kevin Fenzi | 3d4d6ddc8d | |
Adam Williamson | d37a1e4622 | |
Adam Williamson | 4fc84a77a2 | |
Adam Williamson | 9181574bcc | |
Luya Tshimbalanga | c86a3d3f99 | |
Luya Tshimbalanga | 59a047ebf7 | |
Bruno Wolff III | 232e5174ce | |
Peter Robinson | 06fc035621 | |
Adam Williamson | 722a7889fa | |
Peter Robinson | 8df52454c6 | |
Adam Miller | 96a6711bb7 | |
Kevin Fenzi | 63bc5b44b7 | |
Bruno Wolff III | ee5d72bae9 | |
Bruno Wolff III | b0471f609a | |
Bruno Wolff III | 7eb869a8ac | |
Bruno Wolff III | b39ac77024 | |
Jan Pazdziora | 27c2ec431d | |
Dan Book | d958d3568f | |
Kevin Fenzi | 20b2147482 | |
Jan Pazdziora | 1a5dea70fc | |
Jan Pazdziora | 4d39c5ca63 | |
Kalev Lember | 1c9fefa186 | |
Dennis Gilmore | 8df2ac9a00 | |
Dennis Gilmore | 30e01b5bc6 | |
Kevin Fenzi | 97b13fb90b | |
Dennis Gilmore | fc2a0cf4d5 | |
Christian Dersch | cf7f713f34 | |
Dennis Gilmore | 5e553abc09 | |
Dennis Gilmore | ea508e51e5 | |
Christian Dersch | bdceb70ed8 | |
Dusty Mabe | b529dcba60 |
30
README
30
README
|
@ -1,30 +0,0 @@
|
|||
This project is used to manage the Fedora kickstart
|
||||
files used in composing Fedora release images.
|
||||
|
||||
The master branch is used by rawhide and each
|
||||
release branch is used by that release.
|
||||
|
||||
Changes should be made to rawhide first, then
|
||||
cherry-picked back to any release branches that require
|
||||
it.
|
||||
|
||||
All changes should be made via the PR workflow.
|
||||
|
||||
This project is packaged in Fedora as the
|
||||
spin-kickstarts package allowing users to see
|
||||
and modify the kickstart files for their local needs.
|
||||
|
||||
To make a release:
|
||||
|
||||
git clone ssh://git@pagure.io/spin-kickstarts.git spin-kickstarts
|
||||
cd spin-kickstarts
|
||||
# If you need a specific branch other than master:
|
||||
git checkout BRANCHNAME
|
||||
# No tag has been added yet tag HEAD with
|
||||
git tag VERSION
|
||||
git push --tags
|
||||
make
|
||||
# Publish the released tar ball
|
||||
make publish
|
||||
# Clean up the generated files:
|
||||
make clean
|
|
@ -0,0 +1,31 @@
|
|||
# fedora-kickstarts #
|
||||
|
||||
This project is used to manage the Fedora kickstart files used in composing Fedora release images.
|
||||
|
||||
The master branch is used by rawhide and each release branch is used by that release.
|
||||
|
||||
All changes should be made via the PR workflow.
|
||||
|
||||
This project is packaged in Fedora as the spin-kickstarts package allowing users to see
|
||||
and modify the kickstart files for their local needs.
|
||||
|
||||
## To make a release ##
|
||||
|
||||
* git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
|
||||
* cd fedora-kickstarts
|
||||
* # If you need a specific branch other than master:
|
||||
* git checkout BRANCHNAME
|
||||
* # No tag has been added yet tag HEAD with
|
||||
* git tag VERSION
|
||||
* git push --tags
|
||||
* make
|
||||
* # Publish the released tar ball
|
||||
* make publish
|
||||
* # Clean up the generated files:
|
||||
* make clean
|
||||
|
||||
# bug reports #
|
||||
|
||||
Bugs should be reported to the spin-kickstarts bugzilla component:
|
||||
|
||||
https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts
|
|
@ -9,7 +9,6 @@ selinux --permissive
|
|||
firewall --disabled
|
||||
bootloader --timeout=1 --append="acpi=force"
|
||||
network --bootproto=dhcp --device=eth0 --onboot=on
|
||||
services --enabled=network
|
||||
|
||||
# Uncomment the next line
|
||||
# to make the root password be thincrust
|
||||
|
@ -95,5 +94,9 @@ generic-logos
|
|||
#
|
||||
%post
|
||||
|
||||
# Enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network on
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -7,14 +7,15 @@ firewall --enabled --service=mdns,ssh
|
|||
# configure extlinux bootloader
|
||||
bootloader extlinux
|
||||
|
||||
part /boot --size=512 --fstype ext4
|
||||
part swap --size=512 --fstype swap
|
||||
part / --size=3584 --fstype ext4
|
||||
part /boot/fw --size=30 --fstype vfat --asprimary
|
||||
part /boot --size=512 --fstype ext4 --asprimary
|
||||
part swap --size=512 --fstype swap --asprimary
|
||||
part / --size=3584 --fstype ext4 --asprimary
|
||||
|
||||
# make sure that initial-setup runs and lets us do all the configuration bits
|
||||
firstboot --reconfig
|
||||
|
||||
services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
|
||||
services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
||||
|
@ -25,11 +26,13 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
|
|||
@dial-up
|
||||
|
||||
kernel
|
||||
fedora-arm-installer
|
||||
dracut-config-generic
|
||||
|
||||
# install tools needed to manage and boot arm systems
|
||||
@arm-tools
|
||||
rng-tools
|
||||
chrony
|
||||
extlinux-bootloader
|
||||
bcm283x-firmware
|
||||
initial-setup
|
||||
initial-setup-gui
|
||||
#lets resize / on first boot
|
||||
|
@ -38,15 +41,26 @@ initial-setup-gui
|
|||
# remove this in %post
|
||||
dracut-config-generic
|
||||
|
||||
# install uboot images
|
||||
uboot-images-armv7
|
||||
|
||||
# make sure all the locales are available for inital0-setup and anaconda to work
|
||||
glibc-all-langpacks
|
||||
|
||||
# workaround for consequence of RHBZ #1324623: without this, with
|
||||
# yum-based creation tools, compose fails due to conflict between
|
||||
# libcrypt and libcrypt-nss. dnf does not seem to have the same
|
||||
# issue, so this may be dropped when appliance-creator is ported
|
||||
# to dnf.
|
||||
libcrypt-nss
|
||||
-libcrypt
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
# Setup Raspberry Pi firmware
|
||||
cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
|
||||
cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
|
||||
cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
|
||||
sed -i '/vfat/ d' /etc/fstab
|
||||
|
||||
# work around for poor key import UI in PackageKit
|
||||
rm -f /var/lib/rpm/__db*
|
||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
||||
|
@ -67,5 +81,13 @@ systemctl mask tmp.mount
|
|||
|
||||
dnf -y remove dracut-config-generic
|
||||
|
||||
# Disable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network off
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -5,8 +5,5 @@
|
|||
part / --size=5632 --fstype ext4
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
|
||||
echo .
|
||||
|
||||
%end
|
||||
|
|
|
@ -3,8 +3,5 @@
|
|||
%include fedora-lxde-packages.ks
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
|
||||
echo .
|
||||
|
||||
%end
|
||||
|
|
|
@ -5,8 +5,5 @@
|
|||
part / --size=5500 --fstype ext4
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
|
||||
echo .
|
||||
|
||||
%end
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
%include fedora-arm-base.ks
|
||||
|
||||
part /boot --size=512 --fstype ext4
|
||||
part swap --size=256 --fstype swap
|
||||
part / --size=1279 --fstype ext4
|
||||
|
||||
|
|
|
@ -2,9 +2,104 @@
|
|||
%include fedora-arm-xbase.ks
|
||||
%include fedora-soas-packages.ks
|
||||
|
||||
firewall --enabled --service=mdns,presence
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
|
||||
echo .
|
||||
|
||||
# Rebuild initrd for Sugar boot screen
|
||||
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
|
||||
/usr/sbin/plymouth-set-default-theme sugar
|
||||
/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
|
||||
|
||||
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
||||
rm -f /var/lib/rpm/__db*
|
||||
|
||||
# Get proper release naming in the control panel
|
||||
cat >> /boot/olpc_build << EOF
|
||||
Sugar on a Stick
|
||||
EOF
|
||||
cat /etc/fedora-release >> /boot/olpc_build
|
||||
|
||||
# Add our activities to the favorites
|
||||
cat > /usr/share/sugar/data/activities.defaults << EOF
|
||||
org.laptop.WebActivity
|
||||
org.laptop.HelpActivity
|
||||
org.laptop.Chat
|
||||
org.laptop.sugar.ReadActivity
|
||||
org.laptop.sugar.GetBooksActivity
|
||||
org.laptop.AbiWordActivity
|
||||
org.laptop.TurtleArtActivity
|
||||
org.laptop.Calculate
|
||||
org.laptop.Clock
|
||||
org.laptop.ImageViewerActivity
|
||||
org.laptop.Memorize
|
||||
org.laptop.physics
|
||||
org.laptop.Pippy
|
||||
org.laptop.RecordActivity
|
||||
org.laptop.Oficina
|
||||
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
|
||||
org.sugarlabs.AbacusActivity
|
||||
org.sugarlabs.IRC
|
||||
org.sugarlabs.InfoSlicer
|
||||
org.sugarlabs.PortfolioActivity
|
||||
org.sugarlabs.StoryActivity
|
||||
org.sugarlabs.VisualMatchActivity
|
||||
com.garycmartin.Moon
|
||||
mulawa.Countries
|
||||
tv.alterna.Clock
|
||||
vu.lux.olpc.Maze
|
||||
vu.lux.olpc.Speak
|
||||
EOF
|
||||
|
||||
cat > /etc/sysconfig/desktop <<EOF
|
||||
PREFERRED=/usr/bin/sugar
|
||||
DISPLAYMANAGER=/usr/sbin/lightdm
|
||||
EOF
|
||||
|
||||
# set up lightdm autologin
|
||||
sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
|
||||
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||
# set Sugar as default session, otherwise login will fail
|
||||
sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
|
||||
|
||||
# Don't use the default system user (in SoaS liveuser) as nick name
|
||||
# Disable the logout menu item in Sugar
|
||||
# Enable Sugar power management
|
||||
cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
|
||||
[org.sugarlabs.user]
|
||||
default-nick='disabled'
|
||||
|
||||
[org.sugarlabs]
|
||||
show-logout=false
|
||||
|
||||
[org.sugarlabs.power]
|
||||
automatic=true
|
||||
EOF
|
||||
|
||||
# disable screensaver locking
|
||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
|
||||
[org.gnome.desktop.screensaver]
|
||||
lock-enabled=false
|
||||
FOE
|
||||
|
||||
# and hide the lock screen option
|
||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
|
||||
[org.gnome.desktop.lockdown]
|
||||
disable-lock-screen=true
|
||||
FOE
|
||||
|
||||
# rebuild schema cache with any overrides we installed
|
||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
|
||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||
|
||||
%end
|
||||
|
|
|
@ -10,3 +10,8 @@ part / --size=5500 --fstype ext4
|
|||
|
||||
%end
|
||||
|
||||
%post
|
||||
# Most of the ARM X accelerated drivers need some level of CMA allocation
|
||||
sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
|
||||
|
||||
%end
|
||||
|
|
|
@ -6,3 +6,11 @@
|
|||
@printing
|
||||
%end
|
||||
|
||||
%post
|
||||
# Most of the ARM X accelerated drivers need some level of CMA allocation
|
||||
sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
|
||||
|
||||
# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
|
||||
ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
|
||||
|
||||
%end
|
||||
|
|
|
@ -5,8 +5,5 @@
|
|||
part / --size=4000 --fstype ext4
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
|
||||
echo .
|
||||
|
||||
%end
|
||||
|
|
|
@ -23,7 +23,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
|
|||
|
||||
# Vagrant setup
|
||||
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
|
||||
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
|
||||
mkdir -m 0700 -p ~vagrant/.ssh
|
||||
cat > ~vagrant/.ssh/authorized_keys << EOKEYS
|
||||
|
|
|
@ -18,11 +18,10 @@ user --name=none
|
|||
|
||||
firewall --disabled
|
||||
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
|
||||
|
||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||
services --disabled=network
|
||||
services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
|
@ -33,14 +32,23 @@ 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=https://kojipkgs.fedoraproject.org/compose/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/25/ --ref=fedora-atomic/25/x86_64/updates/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/'
|
||||
# Set the ref we are tracking to the be fedora-atomic/25/x86_64/docker-host
|
||||
# one, which is what we are using for the two week releases. We want consumers
|
||||
# of this image to track the two week releases
|
||||
ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/25/ fedora-atomic/25/x86_64/docker-host
|
||||
|
||||
# Make sure the ref we're supposedly sitting on (according
|
||||
# to the updated origin) exists.
|
||||
ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --create fedora-atomic:fedora-atomic/25/x86_64/docker-host
|
||||
|
||||
# Remove the old ref so that the commit eventually gets
|
||||
# cleaned up.
|
||||
ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --delete
|
||||
|
||||
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
||||
|
@ -48,6 +56,9 @@ passwd -l root
|
|||
# remove the user anaconda forces us to make
|
||||
userdel -r none
|
||||
|
||||
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
|
||||
cp /etc/skel/.bash* /var/roothome
|
||||
|
||||
# Configure docker-storage-setup to resize the partition table on boot
|
||||
# https://github.com/projectatomic/docker-storage-setup/pull/25
|
||||
echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
|
||||
|
@ -122,8 +133,20 @@ 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.)"
|
||||
|
||||
# For trac ticket https://fedorahosted.org/cloud/ticket/128
|
||||
rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
|
||||
|
||||
echo "Adding Developer Mode GRUB2 menu item."
|
||||
/usr/libexec/atomic-devmode/bootentry add
|
||||
|
||||
%end
|
||||
# enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network off
|
||||
|
||||
# Anaconda is writing an /etc/resolv.conf from the install environment.
|
||||
# The system should start out with an empty file, otherwise cloud-init
|
||||
# will try to use this information and may error:
|
||||
# https://bugs.launchpad.net/cloud-init/+bug/1670052
|
||||
truncate -s 0 /etc/resolv.conf
|
||||
|
||||
%end
|
||||
|
|
|
@ -22,7 +22,8 @@ parole
|
|||
yumex-dnf
|
||||
|
||||
# extra backgrounds
|
||||
f24-backgrounds-extras-base
|
||||
desktop-backgrounds-basic
|
||||
f24-backgrounds-extras-gnome
|
||||
|
||||
# save some space
|
||||
-fedora-icon-theme
|
||||
|
|
|
@ -14,7 +14,7 @@ network --bootproto=dhcp --device=link --activate
|
|||
part / --fstype="ext4" --size=6000
|
||||
part /boot --size=500 --fstype="ext4"
|
||||
shutdown
|
||||
services --disabled=docker-storage-setup,network
|
||||
services --disabled=docker-storage-setup
|
||||
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
|
||||
|
@ -28,4 +28,9 @@ userdel -r none
|
|||
# We copy content of separate /boot partition to root part when building live squashfs image,
|
||||
# and we don't want systemd to try to mount it when pxe booting
|
||||
cat /dev/null > /etc/fstab
|
||||
|
||||
# Disable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network off
|
||||
|
||||
%end
|
||||
|
|
|
@ -32,9 +32,6 @@ dnf-yum
|
|||
# users setup. This can actually take a bit of time. Just fold it
|
||||
# in to the base box disk image
|
||||
rsync
|
||||
# Add fuse-sshfs so that the vagrant-sshfs plugin won't have to
|
||||
# install it on boot. https://github.com/dustymabe/vagrant-sshfs
|
||||
fuse-sshfs
|
||||
%end
|
||||
|
||||
%post --erroronfail
|
||||
|
@ -45,7 +42,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
|
|||
|
||||
# Vagrant setup
|
||||
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
|
||||
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
|
||||
mkdir -m 0700 -p ~vagrant/.ssh
|
||||
cat > ~vagrant/.ssh/authorized_keys << EOKEYS
|
||||
|
|
|
@ -39,11 +39,17 @@ firewall --disabled
|
|||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
|
||||
|
||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
part / --fstype ext4 --grow
|
||||
#
|
||||
# We need to disable 64bit options here or extlinux won't work.
|
||||
# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
|
||||
# and
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
|
||||
#
|
||||
part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
||||
|
@ -64,6 +70,9 @@ kernel-core
|
|||
# Need to pull in the udev subpackage
|
||||
systemd-udev
|
||||
|
||||
# after move away from grub2 - let's add 'which' back
|
||||
which
|
||||
|
||||
# rescue mode generally isn't useful in the cloud context
|
||||
-dracut-config-rescue
|
||||
|
||||
|
@ -244,7 +253,6 @@ rm -f /var/lib/rpm/__db*
|
|||
# <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
|
||||
|
@ -262,5 +270,19 @@ echo "(Don't worry -- that out-of-space error was expected.)"
|
|||
# For trac ticket https://fedorahosted.org/cloud/ticket/128
|
||||
rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
|
||||
|
||||
# Enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network on
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
# Anaconda is writing an /etc/resolv.conf from the install environment.
|
||||
# The system should start out with an empty file, otherwise cloud-init
|
||||
# will try to use this information and may error:
|
||||
# https://bugs.launchpad.net/cloud-init/+bug/1670052
|
||||
truncate -s 0 /etc/resolv.conf
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ firewall --disabled
|
|||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
|
||||
|
||||
network --bootproto=dhcp --device=eth0 --activate --onboot=on
|
||||
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
|
@ -219,5 +219,9 @@ 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.)"
|
||||
|
||||
# Enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network on
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ firewall --disabled
|
|||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
|
||||
|
||||
network --bootproto=dhcp --device=eth0 --activate --onboot=on
|
||||
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
|
@ -211,5 +211,9 @@ 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.)"
|
||||
|
||||
# Enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network on
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
||||
|
@ -30,6 +30,7 @@ reboot
|
|||
|
||||
%packages --excludedocs --instLangs=en --nocore
|
||||
bash
|
||||
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
|
||||
fedora-release
|
||||
rootfiles
|
||||
vim-minimal
|
||||
|
@ -43,6 +44,9 @@ sssd-client
|
|||
%end
|
||||
|
||||
%post --log=/tmp/anaconda-post.log
|
||||
|
||||
set -e
|
||||
|
||||
# Set the language rpm nodocs transaction flag persistently in the
|
||||
# image yum.conf and rpm macros
|
||||
|
||||
|
@ -68,6 +72,7 @@ releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
|||
basearch=$(uname -i)
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
|
||||
|
||||
echo "# fstab intentionally empty for containers" > /etc/fstab
|
||||
rm -f /usr/lib/locale/locale-archive
|
||||
|
||||
#Setup locale properly
|
||||
|
@ -76,13 +81,15 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
|
|||
rm -rf /var/cache/yum/*
|
||||
rm -f /tmp/ks-script*
|
||||
|
||||
#Make it easier for systemd to run in Docker container
|
||||
cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
|
||||
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
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
# Fix /run/lock breakage since it's not tmpfs in docker
|
||||
umount /run
|
||||
systemd-tmpfiles --create --boot
|
||||
|
||||
%end
|
||||
|
|
|
@ -51,7 +51,6 @@ celestia
|
|||
virtualplanet
|
||||
|
||||
# Some astro environment stuff
|
||||
astronomy-bookmarks
|
||||
astronomy-menus
|
||||
astronomy-menus-toplevel
|
||||
|
||||
|
@ -67,16 +66,27 @@ python3-ipython-notebook
|
|||
python3-sympy
|
||||
python3-networkx
|
||||
python3-pandas
|
||||
python3-pillow
|
||||
python3-seaborn
|
||||
python3-statsmodels
|
||||
python3-scikit-learn
|
||||
python3-scikit-image
|
||||
# Python 3 astronomy
|
||||
astropy-tools
|
||||
ginga
|
||||
python3-astropy
|
||||
python3-astroML
|
||||
python3-astroML-addons
|
||||
python3-astroquery
|
||||
python3-astroscrappy
|
||||
python3-APLpy
|
||||
python3-ATpy
|
||||
python3-ccdproc
|
||||
python3-fitsio
|
||||
python3-gatspy
|
||||
python3-photutils
|
||||
python3-pyvo
|
||||
python3-reproject
|
||||
python3-sep
|
||||
|
||||
# matplotlib backends
|
||||
|
@ -111,6 +121,7 @@ kate
|
|||
kate-plugins
|
||||
rlwrap
|
||||
screen
|
||||
plasma-applet-redshift-control
|
||||
|
||||
# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
|
||||
-kde-l10n-*
|
||||
|
|
|
@ -17,7 +17,7 @@ xconfig --startxonboot
|
|||
zerombr
|
||||
clearpart --all
|
||||
part / --size 5120 --fstype ext4
|
||||
services --enabled=NetworkManager,ModemManager --disabled=network,sshd
|
||||
services --enabled=NetworkManager,ModemManager --disabled=sshd
|
||||
network --bootproto=dhcp --device=link --activate
|
||||
shutdown
|
||||
|
||||
|
@ -72,7 +72,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
|
|||
# chkconfig: 345 00 99
|
||||
# description: Init script for live image.
|
||||
### BEGIN INIT INFO
|
||||
# X-Start-Before: display-manager
|
||||
# X-Start-Before: display-manager chronyd
|
||||
### END INIT INFO
|
||||
|
||||
. /etc/init.d/functions
|
||||
|
@ -214,7 +214,9 @@ touch /.liveimg-configured
|
|||
|
||||
# add static hostname to work around xauth bug
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=679486
|
||||
echo "localhost" > /etc/hostname
|
||||
# the hostname must be something else than 'localhost'
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
|
||||
echo "localhost-live" > /etc/hostname
|
||||
|
||||
EOF
|
||||
|
||||
|
@ -321,6 +323,14 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
|||
# See bug 1317709
|
||||
rm -f /boot/*-rescue*
|
||||
|
||||
# Disable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network off
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
|
||||
|
@ -332,4 +342,5 @@ if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
|
|||
if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
|
||||
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
|
||||
fi
|
||||
|
||||
%end
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
# fedora-design-suite.ks
|
||||
# Based on Live Workstation
|
||||
# Description:
|
||||
# - A Spin targeted towards professional designers
|
||||
# - A collection of applications targeted towards professional visual designers
|
||||
# Website: http://fedoraproject.org/wiki/Design_Suite
|
||||
# Maintainers:
|
||||
# Maintainer:
|
||||
# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
|
||||
# - Previous maintainer Sebastian Dziallas
|
||||
# - Credit to Sebastian Dziallas for initiating the project
|
||||
|
||||
%include fedora-live-workstation.ks
|
||||
|
||||
|
@ -39,22 +39,23 @@ gimpfx-foundry
|
|||
gmic-gimp
|
||||
inkscape-psd
|
||||
inkscape-sozi
|
||||
LuxRender-blender
|
||||
inkscape-table
|
||||
#LuxRender-blender Comment that line because i86 support is no longer available
|
||||
sane-backends-drivers-scanners
|
||||
xsane-gimp
|
||||
#YafaRay-blender
|
||||
|
||||
# Preview Gnome Photos
|
||||
# Add extra gnome applications
|
||||
gnome-books
|
||||
gnome-calendar
|
||||
gnome-photos
|
||||
|
||||
# Add gthumb for renaming group files
|
||||
# gthumb
|
||||
|
||||
# Extra wallpapers
|
||||
f23-backgrounds-extras-base
|
||||
f23-backgrounds-extras-gnome
|
||||
f24-backgrounds-extras-base
|
||||
f24-backgrounds-extras-gnome
|
||||
f25-backgrounds-extras-base
|
||||
f25-backgrounds-extras-gnome
|
||||
|
||||
|
||||
# removal of unneeded applications
|
||||
-gnome-boxes
|
||||
|
@ -67,7 +68,7 @@ f24-backgrounds-extras-gnome
|
|||
#Override the favorite desktop application in Dash
|
||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
|
||||
[org.gnome.shell]
|
||||
favorite-apps=['firefox.desktop', 'shotwell.desktop', 'darktable.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
|
||||
favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
|
||||
FOE
|
||||
|
||||
# Add link to lists of tutorials
|
||||
|
|
|
@ -45,14 +45,14 @@ extremetuxracer
|
|||
freeciv
|
||||
freecol
|
||||
freedoom
|
||||
# freedroidrpg cut for size
|
||||
freedroidrpg
|
||||
frozen-bubble
|
||||
gl-117
|
||||
glob2
|
||||
lincity-ng
|
||||
tmw
|
||||
maniadrive
|
||||
maniadrive-music
|
||||
#maniadrive - maniadrive isn't building with php7
|
||||
#maniadrive-music
|
||||
megaglest
|
||||
nethack-vultures
|
||||
netpanzer
|
||||
|
@ -60,13 +60,13 @@ netpanzer
|
|||
nogravity
|
||||
#pinball # Would pull in fluid-soundfont-lite-patches
|
||||
scorched3d
|
||||
supertux
|
||||
# supertux # Crashing
|
||||
#supertuxkart #remove for size
|
||||
ultimatestunts
|
||||
warzone2100
|
||||
wesnoth
|
||||
# worminator # Would pull in fluid-soundfont-lite-patches
|
||||
# warmux - Cut for size
|
||||
warmux
|
||||
xmoto
|
||||
|
||||
# traditional (small)
|
||||
|
|
|
@ -108,7 +108,6 @@ ladspa-vco-plugins
|
|||
#lv2 plugins
|
||||
lv2
|
||||
lv2-avw-plugins
|
||||
lv2-fil-plugins
|
||||
lv2-invada-plugins
|
||||
lv2-kn0ck0ut
|
||||
lv2-ll-plugins
|
||||
|
|
|
@ -30,7 +30,7 @@ part / --size=6144
|
|||
k3b # ~15 megs
|
||||
#kdeartwork # only include some parts of kdeartwork
|
||||
fuse
|
||||
liveusb-creator
|
||||
mediawriter
|
||||
|
||||
# only include kdegames-minimal
|
||||
-kdegames
|
||||
|
|
|
@ -133,9 +133,9 @@ backintime-kde
|
|||
libotf
|
||||
|
||||
#root
|
||||
root
|
||||
root-gui-fitpanel
|
||||
root-python
|
||||
#root
|
||||
#root-gui-fitpanel
|
||||
#root-python
|
||||
|
||||
#Multiple jobs/clustering system
|
||||
# torque
|
||||
|
|
|
@ -76,6 +76,8 @@ EOF
|
|||
# set up lightdm autologin
|
||||
sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
|
||||
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||
# set Sugar as default session, otherwise login will fail
|
||||
sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
|
||||
|
||||
# Don't use the default system user (in SoaS liveuser) as nick name
|
||||
# Disable the logout menu item in Sugar
|
||||
|
@ -90,19 +92,6 @@ show-logout=false
|
|||
[org.sugarlabs.power]
|
||||
automatic=true
|
||||
EOF
|
||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
|
||||
|
||||
cat >> /etc/rc.d/init.d/livesys << EOF
|
||||
# set up lightdm autologin
|
||||
sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
|
||||
sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
|
||||
#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
|
||||
|
||||
# set Sugar as default session, otherwise login will fail
|
||||
sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
|
||||
EOF
|
||||
|
||||
cat >> /etc/rc.d/init.d/livesys-late << EOF
|
||||
|
||||
# disable screensaver locking
|
||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
|
||||
|
@ -117,12 +106,7 @@ disable-lock-screen=true
|
|||
FOE
|
||||
|
||||
# rebuild schema cache with any overrides we installed
|
||||
glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||
|
||||
EOF
|
||||
|
||||
chmod 755 /etc/rc.d/init.d/livesys-late
|
||||
/sbin/restorecon /etc/rc.d/init.d/livesys-late
|
||||
/sbin/chkconfig --add livesys-late
|
||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
|
||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||
|
||||
%end
|
||||
|
|
|
@ -4,7 +4,11 @@
|
|||
|
||||
%include fedora-live-base.ks
|
||||
%include fedora-workstation-packages.ks
|
||||
%include snippets/packagekit-cached-metadata.ks
|
||||
#
|
||||
# Disable this for now to see if packagekit is causing
|
||||
# compose failures by leaving a gpg-agent around holding /dev/null open.
|
||||
#
|
||||
#include snippets/packagekit-cached-metadata.ks
|
||||
|
||||
part / --size 6656
|
||||
|
||||
|
|
|
@ -23,9 +23,9 @@ caja-actions
|
|||
mate-disk-usage-analyzer
|
||||
|
||||
# more backgrounds
|
||||
f24-backgrounds-base
|
||||
f24-backgrounds-mate
|
||||
f24-backgrounds-extras-base
|
||||
f25-backgrounds-base
|
||||
f25-backgrounds-mate
|
||||
f25-backgrounds-extras-base
|
||||
|
||||
# system tools
|
||||
system-config-printer
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
|
||||
#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
-ibus*
|
||||
-hyperv-daemons
|
||||
-webkitgtk4-plugin-process-gtk2
|
||||
webkitgtk3
|
||||
|
||||
# Add some extra fonts
|
||||
dejavu-sans-fonts
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
%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
|
||||
test -f $f && cp $f /mnt/sysimage/$f.kickstart
|
||||
done
|
||||
%end
|
||||
|
||||
|
|
Loading…
Reference in New Issue