Compare commits

..

48 Commits
0.28.1 ... f25

Author SHA1 Message Date
Dusty Mabe
26be0f2d85 Move manipulation of machine-id above systemd-tmpfiles
For complicated reasons the systemd-tmpfiles call acutally
fails and causes the rest of the kspost to not get run. This
commit makes it the last thing to get run.

This has been fixed in future branches with a more complicated
set of patches:

- https://pagure.io/fedora-kickstarts/c/a4ae071
- https://pagure.io/fedora-kickstarts/c/f6ecdc3

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-10-31 11:50:56 -04:00
Dusty Mabe
6553b85eba zero out resolv.conf during install
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

(cherry picked from commit fc0a635bc4)
2017-03-29 14:44:31 -04:00
Jonathan Lebon
015e301b25 fedora-atomic.ks: create new ref and delete old one
1. Make sure that the ref we sit on exists. This will also work around
   a subtle issue which would cause static deltas to not be used (though
   https://github.com/ostreedev/ostree/pull/710 will fix that).
2. Make sure we delete the old refs so that the commit eventually gets
   cleaned up.
2017-03-02 11:01:24 -05:00
Dusty Mabe
e77c443079 atomic: use kojipkgs url everywhere
We need to use the kojipkgs url on the builders because they don't
have access to dl.fp.o. After some discussion we have just decided
to use the kojipkgs url everywhere as the dl.fp.o url is just a
redirect anyway.
2017-02-09 15:02:18 -05:00
Dusty Mabe
3fd7e8b009 atomic: build from updates ostree ref
We want to build images from ostree ref that gets updated "nightly"
but we want consumers of the image to track the two week releases.

This is part of work for ticket: https://pagure.io/releng/issue/6545
2017-02-07 17:17:19 -05:00
Dusty Mabe
8909332a6d atomic: use the dl.fp.o url
Would be better to just go ahead and use the dl.fp.o url in our
ostreesetup command so that we don't have to worry about doing the
remote delete/add in the %post. The dl.fp.o url [1] is just a redirect
to the kojipkgs url [2] anyway.

[1] https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/
[2] https://kojipkgs.fedoraproject.org/atomic/25/
2017-02-07 17:00:50 -05:00
Thomas Mueller
ee920bfa1f Allow vagrant user to sudo to all users
This addresses atomic-wg issue 173.

Also vagrant docs https://www.vagrantup.com/docs/boxes/base.html
tell to configure it like this.

(cherry picked from commit 2cb099d7a3)
2017-02-03 17:04:00 +01:00
Colin Walters
e11de770d0 atomic: Add workaround for bash 2017-01-23 10:26:41 -05:00
Adam Miller
f85bbb10ee add tar to address BZ#1409920
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-01-04 15:32:53 -06:00
Dusty Mabe
0ef56672f7 Fix the url for the ostree repo
Bodhi updates https://kojipkgs.fedoraproject.org/atomic/25/ on every
stable update run. We need to point the repo there as the old location
is what was updated by pungi before F25 release.

Note that https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/
redirects to https://kojipkgs.fedoraproject.org/atomic/25/.
2016-12-05 16:46:41 -05:00
raveit65
15e9749cd4 Mate: add f25-backgrounds-extras 2016-11-19 09:53:49 +01:00
Dennis Gilmore
0933e101c0 Merge branch 'f25' of https://pagure.io/forks/luya/fedora-kickstarts into f25 2016-11-14 13:06:03 -06:00
Peter Robinson
fc25b45421 sugar still needs webkitgtk3 it seems
Signed-off-by: Peter Robinson <Peter Robinson pbrobinson@fedoraproject.org>
2016-11-14 16:33:07 +00:00
Peter Robinson
25735c97b2 fix SoaS user login
Signed-off-by: Peter Robinson <Peter Robinson pbrobinson@fedoraproject.org>
2016-11-13 22:07:13 +00:00
Luya Tshimbalanga
9c4ea05e32 design-suite: remove LuxRender-blender from ks 2016-11-06 10:20:46 -08:00
Christian Dersch
84cba7aaa0 kde: added mediawriter as a replacement for liveusb-creator 2016-11-01 16:44:36 +01:00
Christian Dersch
434aec0dd3 kde: removed obsoleted liveusb-creator 2016-10-31 20:46:13 +01:00
Kamil Páral
d0d81076bb fedora-live-base: change static hostname to localhost-live
This prevents systemd to update it during boot if DHCP supplies a
hostname, which causes sddm to not start. See
https://bugzilla.redhat.com/show_bug.cgi?id=1370222
2016-10-31 19:03:51 +01:00
Christian Dersch
5468763219 astronomy: added ginga FITS viewer and fitsio library 2016-10-28 10:40:56 +02:00
Luya Tshimbalanga
4b020c1d29 design-suite: add F25 supplemental backgrounds and inkscape addon 2016-10-27 19:00:53 -07:00
Peter Robinson
965fb1adab revert ext3 /boot for arm images
The issue has been fixed upstream with improvements to ext4 support in u-boot 2016.11,
in Fedora I backported these fixes to uboot-tools-2016.09.01-2.fc25 and they've now
been verified and that release is now stable so we should be good to revert the ext3
partition workaround for F-25 GA.
2016-10-22 18:44:36 +01:00
Peter Robinson
7f436214bc fix graphical initial-setup on ARM images
The old means of enabling the graphical service is obsolete so remove it.
It's now detected by explicitly enabling graphical.target so do this by default
for all graphical UXes
2016-10-19 13:43:58 +01:00
Christian Dersch
8d66af166c astronomy: enhanced Python 3 toolchain 2016-10-16 16:49:35 +02:00
Jason Brooks
6f3661e3a5 revert network service change 2016-10-14 16:27:02 -07:00
Jason Brooks
5d987e82b3 networking fixes for f25
* removes the extra ens3 ifcfg that seems to be added
by dracut at some point (cloud base did this in their
ks a year ago in c509863)
* adds net.ifnames=0 to the bootloader line, because
that seems to be necessary to actually disable consistent
device naming
* enables the network service

see https://pagure.io/atomic-wg/issue/174
2016-10-14 10:13:10 -07:00
Kevin Fenzi
2de79eaadb Switch cloud base back to extlinux from grub2.
We need to unset the 64bit option on ext4 to make extlinux work.
See https://bugzilla.redhat.com/show_bug.cgi?id=1369934
and http://www.syslinux.org/wiki/index.php/Filesystem#ext

(cherry picked from commit 99727567b0)
2016-10-07 11:28:38 -06:00
Adam Williamson
aaaf21e930 s/f24-backgrounds/f25-backgrounds/
but not f24-backgrounds-extras, as there are no -extras packages
for f25-backgrounds yet...so stay with 24 there.
2016-10-03 14:40:27 -07:00
Peter Robinson
73645f341e Touch the machine-id file
So is seems that if you remove the machine-id file it won't regenerate the file
but if you touch the file and leave it empty on boot it'll put a new machine-id
in the empty file. So work around this bug ("feature"?) by touching the file
so we don't have other issues in the process.

We're track the outcome of this in RHBZ 1379800
2016-09-30 16:58:44 +01:00
Luya Tshimbalanga
b2a85a8796 design-suite: added extra gnome applications 2016-09-28 16:51:59 -07:00
Christian Dersch
f626ce246d astronomy: added astropy-tools subpackage 2016-09-25 12:34:41 +02:00
Peter Robinson
b41f84a72c Most of the new ARM X/Wayland accelerated drivers need some level of CMA allocation 2016-09-22 14:41:53 +01:00
Peter Robinson
dceca557c3 Initial support for Raspberry Pi. We continue to support existing ARM images without any change to the process (except they have a small 30Mb partition at the begining of the image) but all exisiting documented processe work for image writing. The RPi is auto configured and a pure dd to the card, plug and boot. 2016-09-22 14:41:53 +01:00
Dusty Mabe
e0e0f1f7ee cloud: remove sshfs from vagrant image.
It is not yet in the right package lists for cloud so it's not
available at install time.
2016-09-21 14:06:45 -04:00
Kevin Fenzi
c4c8c7add1 Disable packagekit cached metadata generation to see if it's causing compose failures or if it's something else. 2016-09-20 14:36:55 -06:00
Peter Robinson
1f1184c77c Remove machine-id on pre generated images so it's unique on each deployed device
As referenced on the arm list [1] and as already being done on the docker image we
should remove the unique /etc/machine-id file on compose artifacts to ensure it's
regenerated and unique on each deployed host/device. This unifies the process across
all base ks so it's inherited for each artifact.

[1] https://lists.fedoraproject.org/archives/list/arm@lists.fedoraproject.org/message/Q3YZVF5P2OLLPUJQ2LYZSTKWGGDIU6QO/

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2016-09-13 09:12:37 +01:00
Luya Tshimbalanga
2699e4b6a3 design-suite: replace calligra-krita by krita 2016-09-07 10:10:38 -07:00
Peter Robinson
2ac5e77a03 add rng-tools to all ARM images as most arm HW has a HW rng 2016-09-07 15:32:04 +01:00
Amit Saha
c901db770b Scientific: Comment out root for now 2016-08-25 13:45:33 +10:00
Kevin Fenzi
3d4d6ddc8d Switch the cloud base image back to grub2 for now.
For some reason extlinux isn't working right to boot the image.
See bug https://bugzilla.redhat.com/show_bug.cgi?id=1369934
2016-08-24 15:41:24 -06:00
Adam Williamson
d37a1e4622 drop rsyslog service from all cloud kickstarts
it's no longer pulled in by cloud-init (since 2014...). None
of these kickstarts has it in %packages, and it's not in any
of the cloud environment or package groups in comps either. So
it seems like no-one particularly wants rsyslog in the cloud
images.

From compose logs, it looks like trying to enable a non-existent
service in anaconda in Fedora 24 and earlier wasn't a fatal
error (anaconda more or less logged a warning and continued),
but in Fedora 25 and later it does seem to be fatal. It at least
causes one anaconda thread to crash, though the image compose
completes. I think possibly at least the way anaconda's run
in the Cloud compose process, the main thread manages to exit,
but it seems pretty likely the thread crash will result in
problems in the produced image.

Needed on master and f25.
2016-08-24 13:27:45 -06:00
Adam Williamson
4fc84a77a2 manipulate network service in %post (#1369794)
Due to #1369794 , anaconda cannot currently manipulate sysv
services in F25+. So to work around this, take 'network' out of
the services lines in all kickstarts and instead manipulate
it in the %post section, with chkconfig.

Also remove rsyslog from the Atomic image services line because
it doesn't appear to be included in the OStree tree at present
and so attempting to enable the service breaks Atomic image
compose, see e.g.:

https://kojipkgs.fedoraproject.org//work/tasks/9022/15349022/oz-x86_64.log

also correct the name of the ssh service in fedora-arm-base.ks;
it's sshd not ssh.
2016-08-24 10:10:36 -07:00
Adam Williamson
9181574bcc jam: remove retired lv2-fil-plugins
was retired for broken dependencies, no-one has fixed it.
2016-08-23 00:54:18 -05:00
Luya Tshimbalanga
c86a3d3f99 design-suite: fix typo on gimp-dds-plugin 2016-08-22 20:46:51 -07:00
Luya Tshimbalanga
59a047ebf7 design-suite: remove commented line 2016-08-19 14:00:12 -07:00
Bruno Wolff III
232e5174ce Temporarily remove maniadrive
maniadrive isn't building with php7
2016-08-19 15:20:25 -05:00
Peter Robinson
06fc035621 move arm boot partition to ext3
With e2fsprogs after 1.43 the 64bit and metadata_csum features are
enabled by default. These features are not currently supported in
u-boot and the 64bit feature introduces changes such that it cannot
be read by implementations that do not support it. U-Boot does not
support the functionality and hence now won't mount it just in case
it corrupts the filesystem, which is a reasonable response, this how
ever stops us from booting when we have a ext4 /boot file system
which means basically we end up with a pot plant. Go back to using
ext3 for the time being as the mkfs.ext3 option doesn't enable these
features and we get booting systems!! YAY \o/
2016-08-17 13:03:52 +01:00
Adam Williamson
722a7889fa specify libcrypt packages in fedora-arm-base for RHBZ #1324623
This seems to be enough to work around yum's issues in dealing
with the libcrypt/libcrypt-nss package split, at least it is
for me.
2016-08-15 22:11:09 +01:00
Peter Robinson
8df52454c6 initial Fedora 25 branched setup
Signed-off-by: Peter Robinson <Peter Robinson pbrobinson@fedoraproject.org>
2016-07-26 06:51:27 +01:00
80 changed files with 925 additions and 1586 deletions

View File

@@ -11,18 +11,18 @@ and modify the kickstart files for their local needs.
## To make a release ## ## To make a release ##
git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
cd fedora-kickstarts * cd fedora-kickstarts
# If you need a specific branch other than master: * # If you need a specific branch other than master:
git checkout BRANCHNAME * git checkout BRANCHNAME
# No tag has been added yet tag HEAD with * # No tag has been added yet tag HEAD with
git tag VERSION * git tag VERSION
git push --tags * git push --tags
make * make
# Publish the released tar ball * # Publish the released tar ball
make publish * make publish
# Clean up the generated files: * # Clean up the generated files:
make clean * make clean
# bug reports # # bug reports #

View File

@@ -0,0 +1,8 @@
## Lorax template to configure Anaconda to use the local OSTree
## repository on disk.
<%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"

View File

@@ -0,0 +1,11 @@
## Lorax template to embed an OSTree repository into the installer.iso
## and configure an interactive installer use to look for it.
##
## Note that we pull with depth=0 to only get *one* commit into the
## ISO, because we obviously don't want the full history.
<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
runcmd mkdir -p ${workdir}/iso-graft/content/repo
runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}

102
fedora-aos.ks Normal file
View File

@@ -0,0 +1,102 @@
# Kickstart file to build the appliance operating
# system for fedora.
# This is based on the work at http://www.thincrust.net
lang C
keyboard us
timezone US/Eastern
auth --useshadow --passalgo=sha512
selinux --permissive
firewall --disabled
bootloader --timeout=1 --append="acpi=force"
network --bootproto=dhcp --device=eth0 --onboot=on
# Uncomment the next line
# to make the root password be thincrust
# By default the root password is emptied
#rootpw --iscrypted $1$uw6MV$m6VtUWPed4SqgoW6fKfTZ/
#
# Partition Information. Change this as necessary
# This information is used by appliance-tools but
# not by the livecd tools.
#
part / --size 1024 --fstype ext4 --ondisk sda
#
# Repositories
#
%include fedora-repo.ks
#
# Add all the packages after the base packages
#
%packages --excludedocs --nobase
bash
kernel
grub
e2fsprogs
passwd
policycoreutils
chkconfig
rootfiles
yum
vim-minimal
acpid
#needed to disable selinux
lokkit
#Allow for dhcp access
dhclient
iputils
#
# Packages to Remove
#
# no need for kudzu if the hardware doesn't change
-kudzu
-prelink
-setserial
-ed
# Remove the authconfig pieces
-authconfig
-rhpl
-wireless-tools
# Remove the kbd bits
-kbd
-usermode
# these are all kind of overkill but get pulled in by mkinitrd ordering
-mkinitrd
-kpartx
-dmraid
-mdadm
-lvm2
-tar
# selinux toolchain of policycoreutils, libsemanage, ustr
-policycoreutils
-checkpolicy
-selinux-policy*
-libselinux-python
-libselinux
# Things it would be nice to loose
-fedora-logos
generic-logos
-fedora-release-notes
%end
#
# Add custom post scripts after the base post.
#
%post
# Enable network service here, as doing it in the services line
# fails due to RHBZ #1369794
/sbin/chkconfig network on
%end

View File

@@ -4,12 +4,13 @@ auth --useshadow --passalgo=sha512
selinux --enforcing selinux --enforcing
firewall --enabled --service=mdns,ssh firewall --enabled --service=mdns,ssh
bootloader --location=mbr # configure extlinux bootloader
bootloader extlinux
part /boot/fw --size=30 --fstype vfat --asprimary part /boot/fw --size=30 --fstype vfat --asprimary
part /boot --size=512 --fstype ext4 --asprimary part /boot --size=512 --fstype ext4 --asprimary
part swap --size=512 --fstype swap --asprimary part swap --size=512 --fstype swap --asprimary
part / --size=2800 --fstype ext4 --asprimary part / --size=3584 --fstype ext4 --asprimary
# make sure that initial-setup runs and lets us do all the configuration bits # make sure that initial-setup runs and lets us do all the configuration bits
firstboot --reconfig firstboot --reconfig
@@ -22,30 +23,34 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
@core @core
@standard @standard
@hardware-support @hardware-support
@dial-up
kernel kernel
# remove this in %post
dracut-config-generic dracut-config-generic
-dracut-config-rescue
# install tools needed to manage and boot arm systems # install tools needed to manage and boot arm systems
@arm-tools @arm-tools
-uboot-images-armv8
rng-tools rng-tools
chrony chrony
extlinux-bootloader extlinux-bootloader
bcm283x-firmware bcm283x-firmware
initial-setup initial-setup
initial-setup-gui initial-setup-gui
-iwl*
-ipw*
-usb_modeswitch
-iproute-tc
#lets resize / on first boot #lets resize / on first boot
# dracut-modules-growroot # dracut-modules-growroot
# remove this in %post
dracut-config-generic
# make sure all the locales are available for inital0-setup and anaconda to work # make sure all the locales are available for inital0-setup and anaconda to work
glibc-all-langpacks 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 %end
%post %post

View File

@@ -1,8 +1,8 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-kde-common.ks %include fedora-kde-packages.ks
part / --size=6300 --fstype ext4 part / --size=5632 --fstype ext4
%post %post

View File

@@ -1,8 +1,6 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-lxde-common.ks %include fedora-lxde-packages.ks
part / --size=4000 --fstype ext4
%post %post

View File

@@ -1,14 +0,0 @@
%include fedora-arm-base.ks
%include fedora-arm-xbase.ks
%include fedora-lxqt-common.ks
part / --size=4200 --fstype ext4 --asprimary
%packages
# trojita not available on non-x86 platforms
-trojita
%end
%post
%end

View File

@@ -1,8 +1,8 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-mate-common.ks %include fedora-mate-packages.ks
part / --size=6000 --fstype ext4 part / --size=5500 --fstype ext4
%post %post

View File

@@ -1,10 +1,26 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-minimal-common.ks
part /boot --size=512 --fstype ext4
part swap --size=256 --fstype swap part swap --size=256 --fstype swap
part / --size=1256 --fstype ext4 part / --size=1279 --fstype ext4
%packages %packages
-xkeyboard-config -@standard
-@dial-up
-initial-setup-gui
-generic-release*
-glibc-all-langpacks
glibc-langpack-en
iw
NetworkManager-wifi
%end %end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
%end

View File

@@ -1,8 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# The ARM Workstion based Python Classroom Lab
%include fedora-arm-workstation.ks
%include fedora-python-classroom-gnome-common.ks

View File

@@ -1,16 +1,14 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
# server defaults to xfs for / so lets do so on arm also # server defaults to xfs for / so lets do so on arm also
part / --size=2500 --fstype xfs part / --size=3000 --fstype xfs
%packages %packages
# install the default groups for the server environment since installing the environment is not working -@dial-up
# install the default groups for the server evironment since installing the environment is not working
@server-product @server-product
@standard @standard
@headless-management @headless-management
@hardware-support
@networkmanager-submodules
@container-management @container-management
@domain-client @domain-client
-initial-setup-gui -initial-setup-gui

View File

@@ -1,9 +1,105 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-soas-common.ks %include fedora-soas-packages.ks
part / --size=3300 --fstype ext4 --asprimary firewall --enabled --service=mdns,presence
%post %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 %end

View File

@@ -1,8 +1,8 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-workstation-common.ks %include fedora-workstation-packages.ks
part / --size=6200 --fstype ext4 part / --size=5500 --fstype ext4
%packages %packages
-initial-setup -initial-setup

View File

@@ -1,8 +1,8 @@
%include fedora-arm-base.ks %include fedora-arm-base.ks
%include fedora-arm-xbase.ks %include fedora-arm-xbase.ks
%include fedora-xfce-common.ks %include fedora-xfce-packages.ks
part / --size=4700 --fstype ext4 part / --size=4000 --fstype ext4
%post %post

View File

@@ -1,8 +1,10 @@
# Like the Atomic Host cloud image, but tuned for vagrant: enable the # Like the Atomic cloud image, but tuned for vagrant. Enable
# vagrant user, disable cloud-init. # the vagrant user, disable cloud-init.
%include fedora-atomic.ks %include fedora-atomic.ks
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
user --name=vagrant --password=vagrant user --name=vagrant --password=vagrant
rootpw vagrant rootpw vagrant
@@ -12,16 +14,13 @@ rootpw vagrant
# platforms (virtualbox and kvm) # platforms (virtualbox and kvm)
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
%post --erroronfail %post --erroronfail
# Work around cloud-init being both disabled and enabled; need # Work around cloud-init being both disabled and enabled; need
# to refactor to a common base. # to refactor to a common base.
systemctl mask cloud-init cloud-init-local cloud-config cloud-final systemctl mask cloud-init cloud-init-local cloud-config cloud-final
# The inherited cloud %post locks the passwd, but we want it
# unlocked for vagrant, just like downstream.
passwd -u root
# Vagrant setup # Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd

View File

@@ -1,22 +1,12 @@
# Fedora Atomic Host is the Fedora version of the "Atomic Host" pattern # Fedora Atomic is a cloud-focused spin implementing the Project
# from [Project Atomic](http://www.projectatomic.io/). # Atomic patterns. Note that this replicates the same tree which can
# now be installed on bare metal.
# This kickstart is used for cloud/virt images, and uses cloud-init # This image allocates most space to an LVM-managed thin pool
# to bootstrap authentication, just like Fedora Cloud Base. (Also note the # dedicated for Docker containers, and uses docker-storage-setup to
# fedora-atomic-vagrant.ks kickstart inherits from this). # dynamically resize storage on boot.
# One very important thing to understand is that this image contains the same text
# OSTree commit as will be used on bare metal installations - Fedora Atomic Host
# also has an ISO. One difference though is that cloud-init isn't enabled for
# bare metal. When processing this kickstart then, Anaconda isn't actually
# installing packages - it's just replicating a "pre-assembled" tree from
# rpm-ostree.
# Basically, the `ostreesetup` verb replaces the traditional `%packages`
# section. For example, `rpm-ostree status` can show you the same checksum and
# version from an ISO install and this cloud image - it's the same bits.
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
lang en_US.UTF-8 lang en_US.UTF-8
keyboard us keyboard us
timezone --utc Etc/UTC timezone --utc Etc/UTC
@@ -24,77 +14,54 @@ timezone --utc Etc/UTC
auth --useshadow --passalgo=sha512 auth --useshadow --passalgo=sha512
selinux --enforcing selinux --enforcing
rootpw --lock --iscrypted locked rootpw --lock --iscrypted locked
user --name=none
# Explicitly disable firewall since cloud providers generally provide
# higher level firewall constructs (i.e. security groups).
firewall --disabled firewall --disabled
# console=ttyAMA0 and console=hvc0 as kernel boot parameter to see bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
# kernel boot messages on serial console as well on aarch64 and
# ppc64le respectively.
# https://pagure.io/atomic-wg/issue/347
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 console=ttyAMA0 console=hvc0 net.ifnames=0"
network --bootproto=dhcp --device=link --activate --onboot=on network --bootproto=dhcp --device=link --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
zerombr zerombr
clearpart --all clearpart --all
# Implement: https://pagure.io/atomic-wg/issue/281 # Atomic differs from cloud - we want LVM
# The bare metal layout currently inherits from fedora server and is in part /boot --size=300 --fstype="ext4"
# https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/installclasses/fedora_atomic_host.py
# However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora). So the
# "15GB, rest unallocated" model doesn't make sense. The Vagrant box is 40GB (apparently a number of
# Vagrant boxes come big and rely on thin provisioning).
# In both cases, it's simplest to just fill all the disk space.
#
# Use reqpart to create hardware platform specific partitions
# https://pagure.io/atomic-wg/issue/299
reqpart --add-boot
part pv.01 --grow part pv.01 --grow
volgroup atomicos pv.01 volgroup atomicos pv.01
# Start from 3GB as we did before, since we just need a size. But we do --grow to fill all space. logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks # Equivalent of %include fedora-repo.ks
# Pull from the ostree repo that was created during the compose ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/25/ --ref=fedora-atomic/25/x86_64/updates/docker-host
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/28/${basearch}/updates/atomic-host
reboot reboot
%post --erroronfail %post --erroronfail
# Find the architecture we are on # Set the ref we are tracking to the be fedora-atomic/25/x86_64/docker-host
arch=$(uname -m) # one, which is what we are using for the two week releases. We want consumers
# of this image to track the two week releases
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes. ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/25/ fedora-atomic/25/x86_64/docker-host
# 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/28/ "fedora/28/${arch}/atomic-host"
# Make sure the ref we're supposedly sitting on (according # Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists. # to the updated origin) exists.
ostree refs "fedora-atomic:fedora/28/${arch}/updates/atomic-host" --create "fedora-atomic:fedora/28/${arch}/atomic-host" 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 # Remove the old ref so that the commit eventually gets
# cleaned up. # cleaned up.
ostree refs "fedora-atomic:fedora/28/${arch}/updates/atomic-host" --delete ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --delete
# delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url
ostree remote delete fedora-atomic
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-28-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'
# older versions of livecd-tools do not follow "rootpw --lock" line above # older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root 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 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
cp /etc/skel/.bash* /var/roothome cp /etc/skel/.bash* /var/roothome
# Configure docker-storage-setup to resize the partition table on boot # Configure docker-storage-setup to resize the partition table on boot
# and extend the root filesystem to fill it. # https://github.com/projectatomic/docker-storage-setup/pull/25
# https://pagure.io/atomic-wg/issue/343 echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
echo 'ROOT_SIZE=+100%FREE' >> /etc/sysconfig/docker-storage-setup
echo -n "Getty fixes" echo -n "Getty fixes"
# although we want console output going to the serial console, we don't # although we want console output going to the serial console, we don't
@@ -110,9 +77,12 @@ NETWORKING=yes
NOZEROCONF=yes NOZEROCONF=yes
EOF EOF
# Remove any persistent NIC rules generated by udev # For cloud images, 'eth0' _is_ the predictable device name, since
rm -vf /etc/udev/rules.d/*persistent-net*.rules # we don't want to be tied to specific virtual (!) hardware
# And ensure that we will do DHCP on eth0 on startup rm -f /etc/udev/rules.d/70*
ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
# simple eth0 config, again not hard-coded to the build hardware
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
DEVICE="eth0" DEVICE="eth0"
BOOTPROTO="dhcp" BOOTPROTO="dhcp"
@@ -121,12 +91,24 @@ TYPE="Ethernet"
PERSISTENT_DHCLIENT="yes" PERSISTENT_DHCLIENT="yes"
EOF EOF
# generic localhost names
cat > /etc/hosts << EOF
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
EOF
echo .
# Because memory is scarce resource in most cloud/virt environments, # Because memory is scarce resource in most cloud/virt environments,
# and because this impedes forensics, we are differing from the Fedora # and because this impedes forensics, we are differing from the Fedora
# default of having /tmp on tmpfs. # default of having /tmp on tmpfs.
echo "Disabling tmpfs for /tmp." echo "Disabling tmpfs for /tmp."
systemctl mask tmp.mount systemctl mask tmp.mount
# make sure firstboot doesn't start
echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
# Uncomment this if you want to use cloud init but suppress the creation # Uncomment this if you want to use cloud init but suppress the creation
# of an "ec2-user" account. This will, in the absence of further config, # of an "ec2-user" account. This will, in the absence of further config,
# cause the ssh key from a metadata source to be put in the root account. # cause the ssh key from a metadata source to be put in the root account.
@@ -136,7 +118,7 @@ systemctl mask tmp.mount
#EOF #EOF
echo "Removing random-seed so it's not the same in every image." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/random-seed
echo "Packages within this cloud image:" echo "Packages within this cloud image:"
echo "-----------------------------------------------------------------------" echo "-----------------------------------------------------------------------"
@@ -151,13 +133,13 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
rm -f /var/tmp/zeros rm -f /var/tmp/zeros
echo "(Don't worry -- that out-of-space error was expected.)" echo "(Don't worry -- that out-of-space error was expected.)"
# For trac ticket https://pagure.io/atomic-wg/issue/128 # For trac ticket https://fedorahosted.org/cloud/ticket/128
rm -f /etc/sysconfig/network-scripts/ifcfg-ens3 rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
echo "Adding Developer Mode GRUB2 menu item." echo "Adding Developer Mode GRUB2 menu item."
/usr/libexec/atomic-devmode/bootentry add /usr/libexec/atomic-devmode/bootentry add
# Disable network service here, as doing it in the services line # enable network service here, as doing it in the services line
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network off /sbin/chkconfig network off

View File

@@ -1,18 +0,0 @@
# fedora-cinnamon-common.ks
#
# Description:
# - Fedora package set for the Cinnamon Desktop Environment
#
# Maintainer(s):
# - Dan Book <grinnz@grinnz.com>
%packages
@networkmanager-submodules
@cinnamon-desktop
@libreoffice
# extra backgrounds
f27-backgrounds-extras-gnome
%end

View File

@@ -0,0 +1,32 @@
# fedora-cinnamon-packages.ks
#
# Description:
# - Fedora package set for the Cinnamon Desktop Environment
#
# Maintainer(s):
# - Dan Book <grinnz@grinnz.com>
%packages
@networkmanager-submodules
@cinnamon-desktop
@libreoffice
# internet and multimedia
pidgin
hexchat
transmission
parole
# make sure we have a graphical installer
yumex-dnf
# extra backgrounds
desktop-backgrounds-basic
f24-backgrounds-extras-gnome
# save some space
-fedora-icon-theme
-PackageKit* # we switched to yumex, so we don't need this
%end

12
fedora-cloud-base-arm.ks Normal file
View File

@@ -0,0 +1,12 @@
%include fedora-cloud-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
part /boot --fstype="ext4" --size=500
part /boot/efi --fstype="vfat" --size=100
%packages
efibootmgr
grub2-efi
shim
%end

10
fedora-cloud-base-ppc.ks Normal file
View File

@@ -0,0 +1,10 @@
%include fedora-cloud-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
part prepboot --fstype="prepboot" --size=4
part /boot --fstype="ext4" --size=500
%packages
grub2
%end

View File

@@ -19,7 +19,7 @@ rootpw vagrant
# even on VirtualBox virt, we get a primary network device with "eth0" as the name # 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 # This simplifies things and allows a single disk image for both supported Vagrant
# platforms (virtualbox and kvm) # platforms (virtualbox and kvm)
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
%packages %packages
# The default koji Vagrantfile configuration uses rsync to sync files between # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,8 +32,6 @@ dnf-yum
# users setup. This can actually take a bit of time. Just fold it # users setup. This can actually take a bit of time. Just fold it
# in to the base box disk image # in to the base box disk image
rsync rsync
# Add in sshfs for vagrant-sshfs plugin
fuse-sshfs
%end %end
%post --erroronfail %post --erroronfail

View File

@@ -1,10 +1,10 @@
# This is a basic Fedora cloud spin designed to work in OpenStack and other # This is a basic Fedora 21 spin designed to work in OpenStack and other
# private cloud environments. It's configured with cloud-init so it will # private cloud environments. It's configured with cloud-init so it will
# take advantage of ec2-compatible metadata services for provisioning ssh # take advantage of ec2-compatible metadata services for provisioning ssh
# keys. Cloud-init creates a user account named "fedora" with passwordless # keys. Cloud-init creates a user account named "fedora" with passwordless
# sudo access. The root password is empty and locked by default. # sudo access. The root password is empty and locked by default.
# #
# Note that unlike the standard Fedora install, this image has /tmp on disk # Note that unlike the standard F20 install, this image has /tmp on disk
# rather than in tmpfs, since memory is usually at a premium. # rather than in tmpfs, since memory is usually at a premium.
# #
# This kickstart file is designed to be used with ImageFactory (in Koji). # This kickstart file is designed to be used with ImageFactory (in Koji).
@@ -13,18 +13,18 @@
# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes. # http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
# #
# For a TDL file, I store one here: # For a TDL file, I store one here:
# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl # https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
# (Koji generates one internally...what we really want is Koji to publish it statically) # (Koji generates one internally...what we really want is Koji to publish it statically)
# #
# Once you have imagefactory and imagefactory-plugins installed, run: # Once you have imagefactory and imagefactory-plugins installed, run:
# #
# curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl # curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl
# tempfile=$(mktemp --suffix=.ks) # tempfile=$(mktemp --suffix=.ks)
# ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile} # ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
# imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl # imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
# #
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931 cmdline
lang en_US.UTF-8 lang en_US.UTF-8
keyboard us keyboard us
timezone --utc Etc/UTC timezone --utc Etc/UTC
@@ -32,18 +32,24 @@ timezone --utc Etc/UTC
auth --useshadow --passalgo=sha512 auth --useshadow --passalgo=sha512
selinux --enforcing selinux --enforcing
rootpw --lock --iscrypted locked rootpw --lock --iscrypted locked
user --name=none
firewall --disabled firewall --disabled
# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images. bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
network --bootproto=dhcp --device=link --activate --onboot=on network --bootproto=dhcp --device=link --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
zerombr zerombr
clearpart --all clearpart --all
autopart --noboot --nohome --noswap --nolvm #
# 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 %include fedora-repo.ks
@@ -82,9 +88,7 @@ which
#-kbd #-kbd
-uboot-tools -uboot-tools
-kernel -kernel
# No need for plymouth. Also means anaconda won't put rhgb/quiet -grub2
# on kernel command line
-plymouth
%end %end
@@ -118,6 +122,12 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf
# older versions of livecd-tools do not follow "rootpw --lock" line above # older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
passwd -l root 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
@@ -153,6 +163,9 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
build-locale-archive build-locale-archive
echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
< /etc/yum.conf > /etc/yum.conf.new
mv /etc/yum.conf.new /etc/yum.conf
echo -n "Getty fixes" echo -n "Getty fixes"
@@ -171,6 +184,11 @@ NOZEROCONF=yes
DEVTIMEOUT=10 DEVTIMEOUT=10
EOF EOF
# For cloud images, 'eth0' _is_ the predictable device name, since
# we don't want to be tied to specific virtual (!) hardware
rm -f /etc/udev/rules.d/70*
ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
# simple eth0 config, again not hard-coded to the build hardware # simple eth0 config, again not hard-coded to the build hardware
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
DEVICE="eth0" DEVICE="eth0"
@@ -207,7 +225,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
#EOF #EOF
echo "Removing random-seed so it's not the same in every image." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/random-seed
echo "Cleaning old dnf repodata." echo "Cleaning old dnf repodata."
# FIXME: clear history? # FIXME: clear history?
@@ -227,13 +245,21 @@ echo "-----------------------------------------------------------------------"
# Note that running rpm recreates the rpm db files which aren't needed/wanted # Note that running rpm recreates the rpm db files which aren't needed/wanted
rm -f /var/lib/rpm/__db* 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? # FIXME: is this still needed?
echo "Fixing SELinux contexts." echo "Fixing SELinux contexts."
touch /var/log/cron touch /var/log/cron
touch /var/log/boot.log touch /var/log/boot.log
# ignore return code because UEFI systems with vfat filesystems chattr -i /boot/extlinux/ldlinux.sys
# that don't support selinux will give us errors /usr/sbin/fixfiles -R -a restore
/usr/sbin/fixfiles -R -a restore || true chattr +i /boot/extlinux/ldlinux.sys
echo "Zeroing out empty space." echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files # This forces the filesystem to reclaim space from deleted files
@@ -241,12 +267,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
rm -f /var/tmp/zeros rm -f /var/tmp/zeros
echo "(Don't worry -- that out-of-space error was expected.)" echo "(Don't worry -- that out-of-space error was expected.)"
# When we build the image with oz, dracut is used # For trac ticket https://fedorahosted.org/cloud/ticket/128
# and sets up a ifcfg-en<whatever> for the device. We don't rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
# want to use this, we use eth0 so it is always the same.
# So we remove all these ifcfg-en<whatever> devices so
# The 'network' service can come up cleanly.
rm -f /etc/sysconfig/network-scripts/ifcfg-en*
# Enable network service here, as doing it in the services line # Enable network service here, as doing it in the services line
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794

View File

@@ -23,7 +23,7 @@ user --name=none
firewall --disabled 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" --extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -97,6 +97,10 @@ passwd -l root
# remove the user anaconda forces us to make # remove the user anaconda forces us to make
userdel -r none 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target rm -f /etc/systemd/system/default.target
@@ -174,7 +178,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
#EOF #EOF
echo "Removing random-seed so it's not the same in every image." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/random-seed
echo "Cleaning old yum repodata." echo "Cleaning old yum repodata."
yum history new yum history new
@@ -205,7 +209,9 @@ echo "Fixing SELinux contexts."
touch /var/log/cron touch /var/log/cron
touch /var/log/boot.log touch /var/log/boot.log
mkdir -p /var/cache/yum mkdir -p /var/cache/yum
chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore /usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
echo "Zeroing out empty space." echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files # This forces the filesystem to reclaim space from deleted files

View File

@@ -14,7 +14,7 @@ user --name=none
firewall --disabled 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" --extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -88,6 +88,10 @@ passwd -l root
# remove the user anaconda forces us to make # remove the user anaconda forces us to make
userdel -r none 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target rm -f /etc/systemd/system/default.target
@@ -165,7 +169,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
#EOF #EOF
echo "Removing random-seed so it's not the same in every image." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/random-seed
echo "Cleaning old yum repodata." echo "Cleaning old yum repodata."
yum history new yum history new

View File

@@ -1,90 +0,0 @@
# fedora-disk-base.ks
#
# Defines the basics for all kickstarts in the fedora-live branch
# Does not include package selection (other then mandatory)
# Does not include localization packages or configuration
#
# Does includes "default" language configuration (kickstarts including
# this template can override these settings)
text
lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --passalgo=sha512
selinux --enforcing
firewall --enabled --service=mdns
services --enabled=sshd,NetworkManager,chronyd
network --bootproto=dhcp --device=link --activate
rootpw --lock --iscrypted locked
shutdown
bootloader --timeout=1
zerombr
clearpart --all --initlabel --disklabel=msdos
# make sure that initial-setup runs and lets us do all the configuration bits
firstboot --reconfig
%include fedora-repo.ks
%packages
@core
@standard
@hardware-support
kernel
# remove this in %post
dracut-config-generic
-dracut-config-rescue
# install tools needed to manage and boot arm systems
@arm-tools
-uboot-images-armv7
rng-tools
chrony
bcm283x-firmware
initial-setup
-iwl*
-ipw*
-trousers-lib
-usb_modeswitch
-iproute-tc
-generic-release*
# make sure all the locales are available for inital0-setup and anaconda to work
glibc-all-langpacks
%end
%post
# Setup Raspberry Pi firmware
cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
mv -f /boot/efi/config-64.txt /boot/efi/config.txt
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "Packages within this disk image"
rpm -qa
# Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db*
# remove random seed, the newly installed instance should make it's own
rm -f /var/lib/systemd/random-seed
# The enp1s0 interface is a left over from the imagefactory install, clean this up
rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
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

View File

@@ -1,10 +0,0 @@
%include fedora-disk-base.ks
%include fedora-minimal-common.ks
services --enabled=sshd,NetworkManager,chronyd,initial-setup
autopart --type=plain
%packages
-xkeyboard-config
%end

View File

@@ -1,27 +0,0 @@
%include fedora-disk-base.ks
services --enabled=sshd,NetworkManager,chronyd,initial-setup
autopart
%packages
# install the default groups for the server evironment since installing the environment is not working
@server-product
@standard
@headless-management
@container-management
@domain-client
-initial-setup-gui
-generic-release*
%end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
%end

View File

@@ -1,19 +0,0 @@
%include fedora-disk-base.ks
%include fedora-disk-xbase.ks
%include fedora-workstation-common.ks
bootloader --append="cma=256MB"
services --enabled=sshd,NetworkManager,chronyd
autopart --type=plain
%packages
-initial-setup
-initial-setup-gui
%end
%post
%end

View File

@@ -1,21 +0,0 @@
%packages
@base-x
@fonts
@input-methods
@multimedia
@printing
-@guest-desktop-agents
# Need aajohan-comfortaa-fonts for the SVG rnotes images
aajohan-comfortaa-fonts
# anaconda needs the locales available to run for different locales
glibc-all-langpacks
%end
%post
# 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

View File

@@ -0,0 +1,6 @@
%include fedora-docker-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
part /boot --fstype="ext4" --size=500
part /boot/efi --fstype="vfat" --size=100

View File

@@ -1,70 +0,0 @@
# See docker-base-common.ks for details on how to hack on docker image kickstarts
# This base is a stripped back Fedora image without python3/dnf.
# If you need that use the standard base image.
%include fedora-docker-common.ks
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
microdnf
%end
%post --erroronfail --log=/root/anaconda-post.log
# remove some random help txt files
rm -fv usr/share/gnupg/help*.txt
# Pruning random things
rm usr/lib/rpm/rpm.daily
rm -rfv usr/lib64/nss/unsupported-tools/ # unsupported
# Statically linked crap
rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
ln usr/bin/ln usr/sbin/sln
# Remove some dnf info
rm -rfv /var/lib/dnf
# don't need icons
rm -rfv /usr/share/icons/*
#some random not-that-useful binaries
rm -fv /usr/bin/pinky
# we lose presets by removing /usr/lib/systemd but we do not care
rm -rfv /usr/lib/systemd
# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
rm -fv /etc/localtime
mv /usr/share/zoneinfo/UTC /etc/localtime
rm -rfv /usr/share/zoneinfo
# Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/*
%end
%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
set -eux
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in docker
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
# NOTE: run this in nochroot because "umount" does not exist in chroot
umount /mnt/sysimage/run
# The file that specifies the /run/lock tmpfile is
# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
# rpm that isn't included in this image. We'll create the /run/lock
# file here manually with the settings from legacy.conf
# NOTE: chroot to run "install" because it is not in anaconda env
chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
# NOTE: run this in nochroot because "find" does not exist in chroot
KEEPLANG=en_US
for dir in locale i18n; do
find /mnt/sysimage/usr/share/${dir} -mindepth 1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
done
%end

View File

@@ -0,0 +1,5 @@
%include fedora-docker-base.ks
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
part prepboot --fstype="prepboot" --size=4

View File

@@ -1,42 +1,95 @@
# See docker-base-common.ks for details on how to hack on docker image kickstarts # This is a minimal Fedora install designed to serve as a Docker base image.
# This base is a standard Fedora image with python3 and dnf #
# To keep this image minimal it only installs English language. You need to change
# yum configuration in order to enable other languages.
#
### Hacking on this image ###
# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
# but you can run imagefactory locally too.
#
# 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
#
%include fedora-docker-common.ks cmdline
bootloader --disabled
timezone --isUtc --nontp Etc/UTC
rootpw --lock --iscrypted locked
user --name=none
keyboard us
zerombr
clearpart --all
part / --fstype ext4 --grow
network --bootproto=dhcp --device=link --activate --onboot=on
reboot
%packages --excludedocs --instLangs=en --nocore %packages --excludedocs --instLangs=en --nocore
rootfiles bash
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
fedora-release
rootfiles
vim-minimal vim-minimal
dnf dnf
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29 dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
sssd-client sssd-client
#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
-kernel
%end %end
%post --erroronfail --log=/root/anaconda-post.log %post --log=/tmp/anaconda-post.log
# remove some extraneous files
rm -rf /var/cache/dnf/*
rm -rf /tmp/*
# https://pagure.io/atomic-wg/issue/308 set -e
printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
# Set the language rpm nodocs transaction flag persistently in the
# image yum.conf and rpm macros
# remove the user anaconda forces us to make
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)
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
localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
rm -rf /var/cache/yum/*
rm -f /tmp/ks-script*
#Mask mount units and getty service so that we don't get login prompt #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 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138 # 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 # Fix /run/lock breakage since it's not tmpfs in docker
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
#
# We ignore the return code of the systemd-tmpfiles command because
# at this point we have already removed the /etc/machine-id and all
# tmpfiles lines with %m in them will fail and cause a bad return
# code. Example failure:
# [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
#
umount /run umount /run
systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true systemd-tmpfiles --create --boot
rm /run/nologin # https://pagure.io/atomic-wg/issue/316
%end %end

View File

@@ -1,74 +0,0 @@
# This is the common bits between Fedora Docker base image.
#
# To keep this image minimal it only installs English language. You need to change
# dnf configuration in order to enable other languages.
#
# ## Hacking on this image ###
# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
# but you can run imagefactory locally too.
#
# To do so, testing local changes, first you'll need a TDL file. I store one here:
# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
#
# Then, once you have imagefactory and imagefactory-plugins installed, run:
#
# ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
# imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker
#
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
bootloader --disabled
timezone --isUtc --nontp Etc/UTC
rootpw --lock --iscrypted locked
keyboard us
network --bootproto=dhcp --device=link --activate --onboot=on
reboot
# boot partitions are irrelevant as the final docker image is a tarball
zerombr
clearpart --all
autopart --noboot --nohome --noswap --nolvm
%packages --excludedocs --instLangs=en --nocore
fedora-release
bash
coreutils-single
glibc-minimal-langpack
libcrypt
rpm
shadow-utils
sssd-client
util-linux
-kernel
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
%end
%post --erroronfail --log=/root/anaconda-post.log
set -eux
# Set install langs macro so that new rpms that get installed will
# only install langs that we limit it to.
LANG="en_US"
echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "# fstab intentionally empty for containers" > /etc/fstab
# Remove machine-id on pre generated images
rm -f /etc/machine-id
touch /etc/machine-id
%end

View File

@@ -1,59 +0,0 @@
%packages
@firefox
@kde-apps
@kde-desktop
@kde-media
@kde-office
@kde-telepathy
@networkmanager-submodules
### The KDE-Desktop
### Browser
falkon
### fixes
# use kde-print-manager instead of system-config-printer
-system-config-printer
# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
mariadb-embedded
mariadb-connector-c
mariadb-server
# minimal localization support - allows installing the kde-l10n-* packages
system-config-language
kde-l10n
# unwanted packages from @kde-desktop
# don't include these for now to fit on a cd
-desktop-backgrounds-basic
-kdeaccessibility*
#-ktorrent # kget has also basic torrent features (~3 megs)
-digikam # digikam has duplicate functionality with gwenview (~28 megs)
#-amarok # ~23 megs (mysql-embedded etc.)
-kipi-plugins # ~8 megs + drags in Marble
#-kdeplasma-addons # ~16 megs
#-krusader # ~4 megs
# Additional packages that are not default in kde-* groups, but useful
k3b # ~15 megs
#kdeartwork # only include some parts of kdeartwork
fuse
mediawriter
### space issues
# admin-tools
-gnome-disk-utility
# kcm_clock still lacks some features, so keep system-config-date around
#-system-config-date
# prefer kcm_systemd
-system-config-services
# prefer/use kusers
-system-config-users
## avoid serious bugs by omitting broken stuff
%end

View File

@@ -1,8 +0,0 @@
# remove input methods to free space
%packages
-@input-methods
-scim*
-iok
%end

29
fedora-kde-packages.ks Normal file
View File

@@ -0,0 +1,29 @@
%packages
@firefox
@kde-apps
@kde-desktop
@kde-media
@kde-office
@kde-telepathy
@networkmanager-submodules
### The KDE-Desktop
### Browser
qupzilla
### fixes
# use kde-print-manager instead of system-config-printer
-system-config-printer
# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
mariadb-embedded
mariadb-libs
mariadb-server
# minimal localization support - allows installing the kde-l10n-* packages
system-config-language
kde-l10n
%end

View File

@@ -14,8 +14,7 @@
# Maintainer: Christian Dersch <lupinix@fedoraproject.org> # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
# https://fedoraproject.org/wiki/User:Lupinix # https://fedoraproject.org/wiki/User:Lupinix
%include fedora-live-kde-base.ks %include fedora-live-kde.ks
%include fedora-live-minimization.ks
# The recommended part size for DVDs is too close to use for the astronomy spin # The recommended part size for DVDs is too close to use for the astronomy spin
part / --size 14500 part / --size 14500
@@ -25,13 +24,7 @@ part / --size 14500
# Installing the default/mandatory packages from engineering & scientific # Installing the default/mandatory packages from engineering & scientific
@engineering-and-scientific @engineering-and-scientific
# Basic development
@development-tools
@c-development
# astronomical data analysis # astronomical data analysis
astrometry
astrometry-tycho2
cdsclient cdsclient
fpack fpack
gcx gcx
@@ -42,9 +35,8 @@ sextractor
siril siril
skyviewer skyviewer
swarp swarp
wcstools
# Observatory: KStars + INDI drivers # Observatory: KStars + INDI drivers + Skychart
indi-aagcloudwatcher indi-aagcloudwatcher
indi-apogee indi-apogee
indi-eqmod indi-eqmod
@@ -52,10 +44,10 @@ indi-gphoto
indi-sx indi-sx
indistarter indistarter
kstars kstars
stellarium
# misc. astronomy # misc. astronomy
celestia celestia
stellarium
virtualplanet virtualplanet
# Some astro environment stuff # Some astro environment stuff
@@ -96,7 +88,6 @@ python3-photutils
python3-pyvo python3-pyvo
python3-reproject python3-reproject
python3-sep python3-sep
python3-wcsaxes
# matplotlib backends # matplotlib backends
python3-matplotlib-qt4 python3-matplotlib-qt4

View File

@@ -19,7 +19,6 @@ clearpart --all
part / --size 5120 --fstype ext4 part / --size 5120 --fstype ext4
services --enabled=NetworkManager,ModemManager --disabled=sshd services --enabled=NetworkManager,ModemManager --disabled=sshd
network --bootproto=dhcp --device=link --activate network --bootproto=dhcp --device=link --activate
rootpw --lock --iscrypted locked
shutdown shutdown
%include fedora-repo.ks %include fedora-repo.ks
@@ -56,6 +55,7 @@ aajohan-comfortaa-fonts
# Without this, initramfs generation during live image creation fails: #1242586 # Without this, initramfs generation during live image creation fails: #1242586
dracut-live dracut-live
grub2-efi
syslinux syslinux
# anaconda needs the locales available to run for different locales # anaconda needs the locales available to run for different locales
@@ -173,7 +173,7 @@ if [ -n "\$configdone" ]; then
exit 0 exit 0
fi fi
# add liveuser user with no passwd # add fedora user with no passwd
action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
passwd -d liveuser > /dev/null passwd -d liveuser > /dev/null
usermod -aG wheel liveuser > /dev/null usermod -aG wheel liveuser > /dev/null

View File

@@ -8,7 +8,7 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-cinnamon-common.ks %include fedora-cinnamon-packages.ks
part / --size=6144 part / --size=6144
@@ -32,9 +32,6 @@ sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/li
# set Cinnamon as default session, otherwise login will fail # set Cinnamon as default session, otherwise login will fail
sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
# no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
# Show harddisk install on the desktop # Show harddisk install on the desktop
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop mkdir /home/liveuser/Desktop

View File

@@ -16,24 +16,46 @@ part / --size 14336
# Switch to groups for design suite # Switch to groups for design suite
@design-suite @design-suite
# Provides backup application # Added addons to address rhbz#1336879 from dnf
deja-dup gimp-data-extras
deja-dup-nautilus gimp-dbp
gimp-dds-plugin
gimp-elsamuko
gimp-fourier-plugin
gimp-gap
gimp-help
gimp-help-browser
gimp-high-pass-filter
gimp-layer-via-copy-cut
gimp-lensfun
gimp-lqr-plugin
gimp-normalmap
gimp-paint-studio
gimp-resynthesizer
gimp-save-for-web
gimp-separate+
gimp-wavelet-denoise-plugin
gimpfx-foundry
gmic-gimp
inkscape-psd
inkscape-sozi
inkscape-table
#LuxRender-blender Comment that line because i86 support is no longer available
sane-backends-drivers-scanners
xsane-gimp
#YafaRay-blender
# Add extra gnome applications # Add extra gnome applications
gnome-books gnome-books
gnome-calendar gnome-calendar
gnome-photos gnome-photos
gnome-shell-extension-pomodoro
gnome-todo
# Add cosmetic for gnome-terminal
powerline
powerline-fonts
# Extra wallpapers # Extra wallpapers
# f26-backgrounds-extras-base f24-backgrounds-extras-base
# f26-backgrounds-extras-gnome f24-backgrounds-extras-gnome
f25-backgrounds-extras-base
f25-backgrounds-extras-gnome
# removal of unneeded applications # removal of unneeded applications
-gnome-boxes -gnome-boxes
@@ -46,7 +68,7 @@ powerline-fonts
#Override the favorite desktop application in Dash #Override the favorite desktop application in Dash
cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
[org.gnome.shell] [org.gnome.shell]
favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.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 FOE
# Add link to lists of tutorials # Add link to lists of tutorials

View File

@@ -51,8 +51,8 @@ gl-117
glob2 glob2
lincity-ng lincity-ng
tmw tmw
#maniadrive - currently broken #maniadrive - maniadrive isn't building with php7
#maniadrive-music - has been retired #maniadrive-music
megaglest megaglest
nethack-vultures nethack-vultures
netpanzer netpanzer
@@ -189,6 +189,7 @@ games-menus
# No compilations of games as I want to only include games that at least # No compilations of games as I want to only include games that at least
# someone thought were good within a genre. # someone thought were good within a genre.
-kdegames
# Nothing should be downloading data to play. # Nothing should be downloading data to play.
-autodownloader -autodownloader

View File

@@ -77,7 +77,7 @@ sooperlooper
#recodring and DAW #recodring and DAW
audacity audacity
ardour5 ardour4
rosegarden4 rosegarden4
seq24 seq24
muse muse

View File

@@ -3,7 +3,7 @@
# mailto:kde@lists.fedoraproject.org # mailto:kde@lists.fedoraproject.org
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-kde-common.ks %include fedora-kde-packages.ks
%post %post
@@ -55,9 +55,11 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
Driver=QSQLITE3 Driver=QSQLITE3
AKONADI_EOF AKONADI_EOF
# Disable plasma-pk-updates (bz #1436873 and 1206760) # Disable plasma-pk-updates
echo "Removing plasma-pk-updates package." sed -i \
rpm -e plasma-pk-updates -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 # Disable baloo
cat > /home/liveuser/.config/baloofilerc << BALOO_EOF cat > /home/liveuser/.config/baloofilerc << BALOO_EOF

View File

@@ -9,10 +9,67 @@
%include fedora-live-kde-base.ks %include fedora-live-kde-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-kde-minimization.ks
# DVD payload # DVD payload
part / --size=6200 part / --size=6144
%packages
# unwanted packages from @kde-desktop
# don't include these for now to fit on a cd
-desktop-backgrounds-basic
-kdeaccessibility*
#-ktorrent # kget has also basic torrent features (~3 megs)
-digikam # digikam has duplicate functionality with gwenview (~28 megs)
#-amarok # ~23 megs (mysql-embedded etc.)
-kipi-plugins # ~8 megs + drags in Marble
#-kdeplasma-addons # ~16 megs
#-krusader # ~4 megs
# Additional packages that are not default in kde-* groups, but useful
k3b # ~15 megs
#kdeartwork # only include some parts of kdeartwork
fuse
mediawriter
# only include kdegames-minimal
-kdegames
kdegames-minimal
### space issues
# fonts (we make no bones about admitting we're english-only)
wqy-microhei-fonts # a compact CJK font, to replace:
-naver-nanum-gothic-fonts # Korean
-vlgothic-fonts # Japanese
-adobe-source-han-sans-cn-fonts # simplified Chinese
-adobe-source-han-sans-tw-fonts # traditional Chinese
-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
#-stix-fonts # mathematical symbols
# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
# save some space (from @standard)
-make
# admin-tools
-gnome-disk-utility
# kcm_clock still lacks some features, so keep system-config-date around
#-system-config-date
# prefer kcm_systemd
-system-config-services
# prefer/use kusers
-system-config-users
## avoid serious bugs by omitting broken stuff
%end
%post %post
%end %end

View File

@@ -8,7 +8,7 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-lxde-common.ks %include fedora-lxde-packages.ks
%post %post
# LXDE and LXDM configuration # LXDE and LXDM configuration

View File

@@ -1,51 +0,0 @@
# fedora-live-lxqt.ks
#
# Description:
# Fedora Live Spin with the LXQt desktop environment
#
# Maintainer(s):
# Christian Dersch <lupinix@fedoraproject.org>
#
%include fedora-live-base.ks
%include fedora-live-minimization.ks
%include fedora-lxqt-common.ks
%post
# add initscript
cat >> /etc/rc.d/init.d/livesys << EOF
# set up autologin for user liveuser
if [ -f /etc/sddm.conf ]; then
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
else
cat > /etc/sddm.conf << SDDM_EOF
[Autologin]
User=liveuser
Session=lxqt.desktop
SDDM_EOF
fi
# show liveinst.desktop on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop
cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
# set up preferred apps
cat > /etc/xdg/libfm/pref-apps.conf << FOE
[Preferred Applications]
WebBrowser=qupzilla.desktop
FOE
# no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
EOF
%end

View File

@@ -4,11 +4,48 @@
# mailto:desktop@lists.fedoraproject.org # mailto:desktop@lists.fedoraproject.org
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-mate-common.ks %include fedora-mate-packages.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
part / --size 6144 part / --size 6144
%packages
# Drop things for size
-@3d-printing
-brasero
-colord
-fedora-icon-theme
-GConf2
-gnome-bluetooth-libs
-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-themes
-gnome-themes-standard
-gnome-user-docs
-@mate-applications
-mate-icon-theme-faenza
# Drop oversized fonts that aren't needed
# Drop things that pull in perl
# Dictionaries are big
# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
# strong preference to giving it a go on #fedora-desktop.
# also see http://bugzilla.gnome.org/681084
# Help and art can be big, too
-gnome-user-docs
-evolution-help
# Legacy cmdline things we don't want
-telnet
%end
%post %post
cat >> /etc/rc.d/init.d/livesys << EOF cat >> /etc/rc.d/init.d/livesys << EOF
@@ -21,9 +58,6 @@ fi
mkdir /home/liveuser/Desktop mkdir /home/liveuser/Desktop
cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# and mark it as executable
chmod +x /home/liveuser/Desktop/liveinst.desktop
# rebuild schema cache with any overrides we installed # rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas glib-compile-schemas /usr/share/glib-2.0/schemas
@@ -40,9 +74,6 @@ if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
fi fi
# no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
# make sure to set the right permissions and selinux contexts # make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/ chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/ restorecon -R /home/liveuser/

View File

@@ -12,6 +12,7 @@
-autofs -autofs
# smartcards won't really work on the livecd. # smartcards won't really work on the livecd.
-coolkey -coolkey
-wget
# scanning takes quite a bit of space :/ # scanning takes quite a bit of space :/
-xsane -xsane

View File

@@ -1,9 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# The Workstion based Python Classroom Lab
%include fedora-live-workstation.ks
%include fedora-live-minimization.ks
%include fedora-python-classroom-gnome-common.ks

View File

@@ -47,6 +47,7 @@ firefox
# Dictionaries are big # Dictionaries are big
-aspell-* -aspell-*
-hunspell-*
-man-pages* -man-pages*
-words -words

View File

@@ -8,8 +8,7 @@
# Maintainer: Amit Saha <amitksaha@fedoraproject.org> # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
# https://fedoraproject.org/wiki/User:Amitksaha # https://fedoraproject.org/wiki/User:Amitksaha
%include fedora-live-kde-base.ks %include fedora-live-kde.ks
%include fedora-live-minimization.ks
# The recommended part size for DVDs is too close to use for the scientific spin # The recommended part size for DVDs is too close to use for the scientific spin
part / --size 14500 part / --size 14500
@@ -20,9 +19,9 @@ part / --size 14500
@engineering-and-scientific @engineering-and-scientific
# scilab # scilab
#scilab scilab
#scilab-devel scilab-devel
#scilab-doc scilab-doc
# Remove sagemath explicitly? # Remove sagemath explicitly?
-sagemath -sagemath
@@ -45,12 +44,12 @@ ddd
valgrind valgrind
#python 2 tools/libraries not included from the groups #python 2 tools/libraries not included from the groups
python2-tools python-tools
python-ipython python-ipython
python-ipython-console python-ipython-console
python-ipython-notebook python-ipython-notebook
sympy sympy
#python-networkx python-networkx
python-pandas python-pandas
#python 3 and tools/libraries not included from the groups #python 3 and tools/libraries not included from the groups
@@ -63,7 +62,7 @@ python3-ipython
python3-ipython-console python3-ipython-console
python3-ipython-notebook python3-ipython-notebook
python3-sympy python3-sympy
#python3-networkx python3-networkx
python3-pandas python3-pandas
# matplotlib backends # matplotlib backends
@@ -80,7 +79,7 @@ apache-commons-math
gcc-gfortran gcc-gfortran
# GUI for R # GUI for R
#rkward rkward
# GUI for Octave # GUI for Octave
qtoctave qtoctave
@@ -134,9 +133,9 @@ backintime-kde
libotf libotf
#root #root
root #root
root-gui-fitpanel #root-gui-fitpanel
root-python #root-python
#Multiple jobs/clustering system #Multiple jobs/clustering system
# torque # torque

View File

@@ -36,7 +36,8 @@ gnome-keyring-pam
-acpid -acpid
-gimp-help -gimp-help
-desktop-backgrounds-basic -desktop-backgrounds-basic
-PackageKit* # we switched to dnfdragora, so we don't need this -realmd # only seems to be used in GNOME
-PackageKit* # we switched to yumex, so we don't need this
-aspell-* # dictionaries are big -aspell-* # dictionaries are big
-gnumeric -gnumeric
-foomatic-db-ppds -foomatic-db-ppds

View File

@@ -10,21 +10,88 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-soas-common.ks %include fedora-soas-packages.ks
firewall --enabled --service=mdns,presence
%post %post
cat >> /etc/rc.d/init.d/livesys << EOF # 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 # set up lightdm autologin
sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf 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/^#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 # set Sugar as default session, otherwise login will fail
sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
EOF
cat >> /etc/rc.d/init.d/livesys-late << EOF # 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 # disable screensaver locking
cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
@@ -39,12 +106,7 @@ disable-lock-screen=true
FOE FOE
# rebuild schema cache with any overrides we installed # rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas /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
EOF
chmod 755 /etc/rc.d/init.d/livesys-late
/sbin/restorecon /etc/rc.d/init.d/livesys-late
/sbin/chkconfig --add livesys-late
%end %end

View File

@@ -3,10 +3,10 @@
# mailto:desktop@lists.fedoraproject.org # mailto:desktop@lists.fedoraproject.org
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-workstation-common.ks %include fedora-workstation-packages.ks
# #
# Disable this for now as packagekit is causing compose failures # Disable this for now to see if packagekit is causing
# by leaving a gpg-agent around holding /dev/null open. # compose failures by leaving a gpg-agent around holding /dev/null open.
# #
#include snippets/packagekit-cached-metadata.ks #include snippets/packagekit-cached-metadata.ks
@@ -17,36 +17,16 @@ part / --size 6656
cat >> /etc/rc.d/init.d/livesys << EOF cat >> /etc/rc.d/init.d/livesys << EOF
# disable gnome-software automatically downloading updates # disable updates plugin
cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
[org.gnome.software] [org.gnome.software]
download-updates=false download-updates=false
FOE FOE
# don't autostart gnome-software session service
rm -f /etc/xdg/autostart/gnome-software-service.desktop
# disable the gnome-software shell search provider
cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE
DefaultDisabled=true
FOE
# don't run gnome-initial-setup # don't run gnome-initial-setup
mkdir ~liveuser/.config mkdir ~liveuser/.config
touch ~liveuser/.config/gnome-initial-setup-done touch ~liveuser/.config/gnome-initial-setup-done
# suppress anaconda spokes redundant with gnome-initial-setup
cat >> /etc/sysconfig/anaconda << FOE
[NetworkSpoke]
visited=1
[PasswordSpoke]
visited=1
[UserSpoke]
visited=1
FOE
# make the installer show up # make the installer show up
if [ -f /usr/share/applications/liveinst.desktop ]; then if [ -f /usr/share/applications/liveinst.desktop ]; then
# Show harddisk install in shell dash # Show harddisk install in shell dash

View File

@@ -11,7 +11,7 @@
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks
%include fedora-xfce-common.ks %include fedora-xfce-packages.ks
%post %post
# xfce configuration # xfce configuration
@@ -60,9 +60,6 @@ sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.d
mkdir /home/liveuser/Desktop mkdir /home/liveuser/Desktop
cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
# no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
# and mark it as executable (new Xfce security feature) # and mark it as executable (new Xfce security feature)
chmod +x /home/liveuser/Desktop/liveinst.desktop chmod +x /home/liveuser/Desktop/liveinst.desktop

View File

@@ -43,7 +43,8 @@ metacity
-acpid -acpid
-gimp-help -gimp-help
-desktop-backgrounds-basic -desktop-backgrounds-basic
-PackageKit* # we switched to dnfdragora, so we don't need this -realmd # only seems to be used in GNOME
-PackageKit* # we switched to yumex, so we don't need this
-foomatic-db-ppds -foomatic-db-ppds
-foomatic -foomatic
-stix-fonts -stix-fonts

View File

@@ -1,52 +0,0 @@
# fedora-lxqt-common.ks
#
# Description:
# Fedora Live Spin with the LXQt desktop environment
#
# Maintainer(s):
# Christian Dersch <lupinix@fedoraproject.org>
#
%packages
@lxqt
@lxqt-apps
@lxqt-media
@networkmanager-submodules
# for nm applet
gnome-keyring
# l10n
lxqt-l10n
lximage-qt-l10n
obconf-qt-l10n
pavucontrol-qt-l10n
# MP3
gstreamer1-plugin-mpg123
# remove unneeded stuff to get a lightweight system
# fonts (we make no bones about admitting we're english-only)
wqy-microhei-fonts # a compact CJK font, to replace:
-naver-nanum-gothic-fonts # Korean
-vlgothic-fonts # Japanese
-adobe-source-han-sans-cn-fonts # simplified Chinese
-adobe-source-han-sans-tw-fonts # traditional Chinese
-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
#-stix-fonts # mathematical symbols
# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
# Why is this not pulled in by anaconda???
storaged
%end

View File

@@ -1,4 +1,6 @@
%packages %packages
-PackageKit* # we switched to yumex, so we don't need this
firefox
@mate @mate
compiz compiz
compiz-plugins-main compiz-plugins-main
@@ -14,11 +16,27 @@ emerald-themes
emerald emerald
fusion-icon fusion-icon
@networkmanager-submodules @networkmanager-submodules
blueman
# some apps from mate-applications # some apps from mate-applications
caja-actions caja-actions
mate-disk-usage-analyzer mate-disk-usage-analyzer
# more backgrounds
f25-backgrounds-base
f25-backgrounds-mate
f25-backgrounds-extras-base
# system tools
system-config-printer
system-config-printer-applet
lightdm-gtk-greeter-settings
# audio video
parole
exaile
PackageKit-gstreamer-plugin
# blacklist applications which breaks mate-desktop # blacklist applications which breaks mate-desktop
-audacious -audacious
@@ -28,28 +46,12 @@ mate-disk-usage-analyzer
# dsl tools # dsl tools
rp-pppoe rp-pppoe
# some tools
p7zip
p7zip-plugins
# FIXME; apparently the glibc maintainers dislike this, but it got put into the # 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. # desktop image at some point. We won't touch this one for now.
nss-mdns nss-mdns
# Drop things for size
-@3d-printing
-brasero
-colord
-fedora-icon-theme
-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-user-docs
-@mate-applications
-mate-icon-theme-faenza
# Help and art can be big, too
-gnome-user-docs
-evolution-help
# Legacy cmdline things we don't want
-telnet
%end %end

View File

@@ -1,19 +0,0 @@
%packages
-@standard
-initial-setup-gui
-generic-release*
-glibc-all-langpacks
glibc-langpack-en
iw
NetworkManager-wifi
%end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
%end

View File

@@ -1,27 +0,0 @@
%include fedora-arm-base.ks
# server defaults to xfs for / so lets do so on arm also
part / --size=2500 --fstype xfs
%packages
# install the default groups for the server evironment since installing the environment is not working
@server-product
@standard
@headless-management
@container-management
@domain-client
-initial-setup-gui
-generic-release*
fedora-modular-release
%end
%post
# setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
echo .
%end

View File

@@ -1,70 +0,0 @@
# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
# This base is a stripped back Fedora image without python3/dnf.
# If you need that use the standard base image.
%include fedora-modular-container-common.ks
%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
microdnf
%end
%post --erroronfail --log=/root/anaconda-post.log
# remove some random help txt files
rm -fv usr/share/gnupg/help*.txt
# Pruning random things
rm usr/lib/rpm/rpm.daily
rm -rfv usr/lib64/nss/unsupported-tools/ # unsupported
# Statically linked crap
rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
ln usr/bin/ln usr/sbin/sln
# Remove some dnf info
rm -rfv /var/lib/dnf
# don't need icons
rm -rfv /usr/share/icons/*
#some random not-that-useful binaries
rm -fv /usr/bin/pinky
# we lose presets by removing /usr/lib/systemd but we do not care
rm -rfv /usr/lib/systemd
# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
rm -fv /etc/localtime
mv /usr/share/zoneinfo/UTC /etc/localtime
rm -rfv /usr/share/zoneinfo
# Final pruning
rm -rfv /var/cache/* /var/log/* /tmp/*
%end
%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
set -eux
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in container
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
# NOTE: run this in nochroot because "umount" does not exist in chroot
umount /mnt/sysimage/run
# The file that specifies the /run/lock tmpfile is
# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
# rpm that isn't included in this image. We'll create the /run/lock
# file here manually with the settings from legacy.conf
# NOTE: chroot to run "install" because it is not in anaconda env
chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
# NOTE: run this in nochroot because "find" does not exist in chroot
KEEPLANG=en_US
for dir in locale i18n; do
find /mnt/sysimage/usr/share/${dir} -mindepth 1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
done
%end

View File

@@ -1,38 +0,0 @@
# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
# This base is a standard Fedora image with python3 and dnf
%include fedora-modular-container-common.ks
%packages --excludedocs --instLangs=en --nocore
rootfiles
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
vim-minimal
dnf
dnf-yum # https://pagure.io/fesco/ticket/1312#comment:29
sssd-client
%end
%post --erroronfail --log=/root/anaconda-post.log
# remove some extraneous files
rm -rf /var/cache/dnf/*
rm -rf /tmp/*
#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
# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
# Fix /run/lock breakage since it's not tmpfs in container
# This unmounts /run (tmpfs) and then recreates the files
# in the /run directory on the root filesystem of the container
#
# We ignore the return code of the systemd-tmpfiles command because
# at this point we have already removed the /etc/machine-id and all
# tmpfiles lines with %m in them will fail and cause a bad return
# code. Example failure:
# [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
#
umount /run
systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
%end

View File

@@ -1,75 +0,0 @@
# This is the common bits between Container base images based on Modular Fedora.
#
# To keep this image minimal it only installs English language. You need to change
# dnf configuration in order to enable other languages.
#
# ## Hacking on this image ###
# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
# but you can run imagefactory locally too.
#
# To do so, testing local changes, first you'll need a TDL file. I store one here:
# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
#
# Then, once you have imagefactory and imagefactory-plugins installed, run:
#
# ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
# imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
#
text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
bootloader --disabled
timezone --isUtc --nontp Etc/UTC
rootpw --lock --iscrypted locked
keyboard us
network --bootproto=dhcp --device=link --activate --onboot=on
reboot
# boot partitions are irrelevant as the final container image is a tarball
zerombr
clearpart --all
autopart --nohome --noswap --nolvm
%packages --excludedocs --instLangs=en --nocore
fedora-modular-release
bash
coreutils-single
glibc-minimal-langpack
libcrypt
rpm
shadow-utils
sssd-client
util-linux
-kernel
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
%end
%post --erroronfail --log=/root/anaconda-post.log
set -eux
# Set install langs macro so that new rpms that get installed will
# only install langs that we limit it to.
LANG="en_US"
echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "# fstab intentionally empty for containers" > /etc/fstab
# Remove machine-id on pre generated images
rm -f /etc/machine-id
touch /etc/machine-id
%end

View File

@@ -1,81 +0,0 @@
text
lang en_US.UTF-8
keyboard us
timezone US/Eastern
auth --useshadow --passalgo=sha512
selinux --enforcing
# Disabled for modular compose (for now)
#firewall --enabled --service=mdns
# Disabled for modular compose (for now)
#services --enabled=sshd,NetworkManager,chronyd,initial-setup
network --bootproto=dhcp --device=link --activate
rootpw --lock --iscrypted locked
shutdown
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
zerombr
clearpart --all --initlabel --disklabel=msdos
autopart --type=plain
# make sure that initial-setup runs and lets us do all the configuration bits
firstboot --reconfig
%include fedora-repo.ks
%packages --excludedocs --excludeWeakdeps --nocore
bash
fedora-modular-release
filesystem
coreutils-single
util-linux
rpm
shadow-utils
microdnf
glibc-minimal-langpack
grubby
kernel
libcrypt
sssd-client
dhcp-client
-fedora-logos
-coreutils
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-dracut
%end
%post
# Setup Raspberry Pi firmware
#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
mv -f /boot/efi/config-64.txt /boot/efi/config.txt
cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
echo "Packages within this disk image"
rpm -qa
# Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db*
# remove random seed, the newly installed instance should make it's own
rm -f /var/lib/systemd/random-seed
# 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

View File

@@ -1,22 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# Common packages of all Python Classroom images
%packages
@python-classroom
@python-science
nano
openssh-clients
vim-enhanced
wget
# Remove Pythons possibly recommended by tox
-python26
-python33
-python34
-python35
-pypy
%end

View File

@@ -1,103 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# GNOME part of Python Classroom images
%include fedora-python-classroom-common.ks
%packages
ninja-ide
emacs
python3-matplotlib-tk
python3-pillow-tk
# Remove extra gnome-y things
-@graphical-internet
-@games
-@sound-and-video
-@multimedia
-dleyna*
-gnome-boxes
-gnome-calendar
-gnome-clocks
-gnome-contacts
-gnome-disk-utility
-gnome-documents
-gnome-font-viewer
-gnome-maps
-gnome-photos
-gnome-weather
-grilo-plugins
-cheese
-totem
-totem-nautilus
# This is no longer workstation
-@workstation-product
# Add a web browser
@firefox
# Remove office suite
-@libreoffice
-libreoffice-*
-planner
# Drop the Java plugin and Java
-icedtea-web
-java*
# No printing
-@printing
-foomatic-db-ppds
-foomatic
# Dictionaries are big
-aspell-*
-words
# Help and art can be big, too
-gnome-user-docs
-gnome-getting-started-docs
-desktop-backgrounds-basic
-*backgrounds-extras
# Legacy cmdline things we don't want
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-quota
-dos2unix
-finger
-ftp
-jwhois
-mtr
-pinfo
-rsh
-nfs-utils
-ypbind
-yp-tools
-rpcbind
-acpid
-ntsysv
# Don't need this
-linux-atm
# Drop some system-config things
-system-config-language
-system-config-network
-system-config-rootpassword
-system-config-services
-policycoreutils-gui
%end
%post
#Override the favorite desktop application in Dash
sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
%end

View File

@@ -1,8 +0,0 @@
# Maintained by the Fedora Python SIG:
# http://fedoraproject.org/wiki/SIGs/Python
# mailto:python-devel@lists.fedoraproject.org
# Like the Python Classroom image, but tuned for vagrant.
%include fedora-cloud-base-vagrant.ks
%include fedora-python-classroom-common.ks

View File

@@ -1,4 +1,4 @@
repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-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/mirrorlist?repo=fedora-$releasever&arch=$basearch url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch

View File

@@ -1,2 +1,2 @@
repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch

View File

@@ -1,164 +0,0 @@
# fedora-livecd-soas.ks
#
# Description:
# - A Sugar environment that you can carry in your pocket
#
# Maintainers:
# - Peter Robinson <pbrobinson AT gmail DOT com>
firewall --enabled --service=mdns,presence
%packages
-@fonts
-@dial-up
-@multimedia
-@printing
-foomatic
-@gnome-desktop
-yp-tools
-ypbind
-rdate
-rdist
-icedtea-web
-firefox
-glx-utils
-nmap-ncat
-PackageKit
-eekboard-libs
-open-vm-tools*
-gfs2-utils
-abrt-cli
-ibus*
-hyperv-daemons
-webkit2gtk3-plugin-process-gtk2
# Add some extra fonts
dejavu-sans-fonts
dejavu-sans-mono-fonts
madan-fonts
aajohan-comfortaa-fonts
sil-abyssinica-fonts
vlgothic-fonts
# == Core Sugar Platform ==
@sugar-desktop
-sugar-ruler
sugar-cp-updater
lightdm
lightdm-gtk
# Write breaks unless we do this (we don't need it anyway)
# enable for testing in the F17 dev cycle
@input-methods
# Needed for wifi, bluetooth and WWAN connection support
@networkmanager-submodules
# == Platform Components ==
# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
alsa-plugins-pulseaudio
alsa-utils
gstreamer1-plugins-base
gstreamer1-plugins-good
gstreamer1-plugins-bad-free
gstreamer-plugins-espeak
pulseaudio
pulseaudio-utils
# explicitly remove openbox and hopefully deal with what firstboot wants
-openbox
# remove deps that come from god knows where
-sane-backends
-sane-backends-drivers-scanners
# Usefulness for DSL connections as per:
# http://bugs.sugarlabs.org/ticket/1951
rp-pppoe
# Get the Sugar boot screen
-plymouth-system-theme
-plymouth-theme-charge
sugar-logos
%end
%post
# 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
# 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
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
%end

87
fedora-soas-packages.ks Normal file
View File

@@ -0,0 +1,87 @@
# fedora-livecd-soas.ks
#
# Description:
# - A Sugar environment that you can carry in your pocket
#
# Maintainers:
# - Peter Robinson <pbrobinson AT gmail DOT com>
# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
# - Mel Chua <mchua AT fedoraproject DOT org>
%packages
-@fonts
-@dial-up
-@multimedia
-@printing
-foomatic
-@gnome-desktop
-yp-tools
-ypbind
-rdate
-rdist
-icedtea-web
-firefox
-glx-utils
-nmap-ncat
-PackageKit
-libfprint
-realmd
-eekboard-libs
-open-vm-tools*
-gfs2-utils
-abrt-cli
-ibus*
-hyperv-daemons
-webkitgtk4-plugin-process-gtk2
webkitgtk3
# Add some extra fonts
dejavu-sans-fonts
dejavu-sans-mono-fonts
madan-fonts
aajohan-comfortaa-fonts
sil-abyssinica-fonts
vlgothic-fonts
# == Core Sugar Platform ==
@sugar-desktop
-sugar-ruler
sugar-cp-updater
lightdm
lightdm-gtk
# Write breaks unless we do this (we don't need it anyway)
# enable for testing in the F17 dev cycle
@input-methods
# Needed for wifi, bluetooth and WWAN connection support
@networkmanager-submodules
# == Platform Components ==
# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
alsa-plugins-pulseaudio
alsa-utils
gstreamer1-plugins-base
gstreamer1-plugins-good
gstreamer1-plugins-bad-free
gstreamer-plugins-espeak
pulseaudio
pulseaudio-utils
# explicitly remove openbox and hopefully deal with what firstboot wants
-openbox
# remove deps that come from god knows where
-sane-backends
-sane-backends-drivers-scanners
# Usefulness for DSL connections as per:
# http://bugs.sugarlabs.org/ticket/1951
rp-pppoe
# Get the Sugar boot screen
-plymouth-system-theme
-plymouth-theme-charge
sugar-logos
%end

View File

@@ -20,6 +20,9 @@
@printing @printing
@workstation-product @workstation-product
# Branding for the installer
fedora-productimg-workstation
# Exclude unwanted packages from @anaconda-tools group # Exclude unwanted packages from @anaconda-tools group
-gfs2-utils -gfs2-utils
-reiserfs-utils -reiserfs-utils

View File

@@ -27,8 +27,10 @@ gnome-keyring-pam
# Note that blank is still default. # Note that blank is still default.
xscreensaver-extras xscreensaver-extras
wget wget
# Handy for debugging
rfkill
# Better more popular browser # Better more popular browser
#firefox firefox
system-config-printer system-config-printer
# save some space # save some space
@@ -36,8 +38,9 @@ system-config-printer
-acpid -acpid
-gimp-help -gimp-help
-desktop-backgrounds-basic -desktop-backgrounds-basic
-realmd # only seems to be used in GNOME
-PackageKit* # we switched to yumex, so we don't need this
-aspell-* # dictionaries are big -aspell-* # dictionaries are big
-xfce4-sensors-plugin -xfce4-sensors-plugin
-foomatic-db-ppds
%end %end

View File

@@ -1,20 +0,0 @@
# fedora-livecd-cinnamon-de_DE.ks
#
# Description:
# - German Fedora Live Spin with the Cinnamon Desktop Environment
#
# Maintainer(s):
# - Björn Esser <besser82@fedoraproject.org>
%include ../fedora-live-cinnamon.ks
lang de_DE.UTF-8
keyboard de-latin1-nodeadkeys
timezone Europe/Berlin
%packages
@german-support
# exclude input methods
-m17n*
-scim*
%end

View File

@@ -1,35 +0,0 @@
# fedora-livecd-cinnamon-ja_JP.ks
#
# Description:
# - Japanese Fedora Live Spin with the Cinnamon Desktop Environment
#
# Maintainer(s):
# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
%include ../fedora-live-cinnamon.ks
lang ja_JP.UTF-8
keyboard jp
timezone Asia/Tokyo
%packages
@japanese-support
# exclude input methods except ibus:
-m17n*
-scim*
-iok
%end
%post
cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
# Read and parsed by systemd-localed. It's probably wise not to edit this file
# manually too freely.
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "jp"
Option "XkbModel" "jp106"
EndSection
EOF
%end

View File

@@ -1,61 +0,0 @@
# fedora-livecd-lxde-ja_JP.ks
#
# Description:
# - Japanese Fedora Live Spin with the LXDE Desktop Environment
#
# Maintainer(s):
# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
%include ../fedora-live-lxde.ks
lang ja_JP.UTF-8
keyboard jp
timezone Asia/Tokyo
%packages
@japanese-support
# exclude input methods:
-m17n*
-scim*
-ibus*
-iok
# Better more popular browser
firefox
# ibus stuff
ibus-kkc
imsettings
%end
%post
cat >> /etc/rc.d/init.d/livesys << EOF
#### setting env and start ibus-deamon ####
#mkdir /home/liveuser
cat >> /home/liveuser/.bash_profile << FOE
export XMODIFIERS="@im=ibus"
export GTK_IM_MODULE=ibus
export QT_IM_MODULE=ibus
ibus-daemon -drx
FOE
#### autostart ibus and stuff ####
cat > /etc/xdg/autostart/imsettings-start.desktop << "FOE"
[Desktop Entry]
Encoding=UTF-8
Type=Application
Version=1.0
Name=Input Method starter
Name[ja]=入力メソッドのスターター
Exec=imsettings-switch -n -q -x
Terminal=false
FOE
EOF
cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
# Read and parsed by systemd-localed. It's probably wise not to edit this file
# manually too freely.
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "jp"
Option "XkbModel" "jp106"
EndSection
EOF
%end

View File

@@ -1,38 +0,0 @@
# fedora-livecd-xfce-ja_JP.ks
#
# Description:
# - Japanese Fedora Live Spin with the Xfce Desktop Environment
#
# Maintainer(s):
# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
%include ../fedora-live-xfce.ks
lang ja_JP.UTF-8
keyboard jp
timezone Asia/Tokyo
%packages
@japanese-support
# exclude input methods except ibus:
-m17n*
-scim*
-iok
# ibus-kkc
ibus-kkc
%end
%post
cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
# Read and parsed by systemd-localed. It's probably wise not to edit this file
# manually too freely.
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "jp"
Option "XkbModel" "jp106"
EndSection
EOF
%end

View File

@@ -19,22 +19,22 @@ PK_PREFIX=`mktemp -d`
mkdir -p $PK_PREFIX/etc/yum.repos.d mkdir -p $PK_PREFIX/etc/yum.repos.d
if [ -f /etc/yum.repos.d/fedora.repo ] ; then if [ -f /etc/yum.repos.d/fedora.repo ] ; then
cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/ 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=https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \ sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
$PK_PREFIX/etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/fedora.repo
fi fi
if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/ 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=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \ 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 $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
fi fi
if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then 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/ 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=https://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \ 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 $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
fi fi
if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/ 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=https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \ sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
$PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
fi fi
rpm --root=$PK_PREFIX --initdb rpm --root=$PK_PREFIX --initdb