correct ostree repo location

see: https://pagure.io/fedora-kickstarts/pull-request/38#comment-8056
Make sure chronyd runs with the correct config
2025-12-10 00:50:32 +08:00 · 2016-08-13 13:25:32 -05:00 · 2016-08-04 07:43:46 -05:00 · 2016-07-27 10:36:46 -07:00 · 2016-07-22 16:04:40 -05:00 · 2016-06-07 21:03:21 -04:00
8 changed files with 34 additions and 73 deletions
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
+The master branch is where development takes place:
+ - it may contain kickstart files that are broken, or
+ - spin concepts that are in the process of being
+   approved by the Board (trademark approval), or
+ - spin concepts that are in the process of being
+   approved by the Spins SIG
+
+The release specific branches contain spin concepts that:
+ - are approved (both by Board and Spin SIG)
+ - maintained for the remainder of the release cycle
+
+git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
+cd spin-kickstarts
+# If you need a specific branch other than master:
+git checkout BRANCHNAME
+# No tag has been added yet tag HEAD with
+git tag VERSION
+git push --tags
+make
+# Publish the released tar ball
+make publish
+# Clean up the generated files:
+make clean
--- a/README.md
+++ b/README.md
@@ -1,31 +0,0 @@
-# fedora-kickstarts #
-
-This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
-
-The master branch is used by rawhide and each release branch is used by that release. 
-
-All changes should be made via the PR workflow. 
-
-This project is packaged in Fedora as the spin-kickstarts package allowing users to see 
-and modify the kickstart files for their local needs. 
-
-## To make a release ##
-
- * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
- * cd fedora-kickstarts
- * # If you need a specific branch other than master:
- * git checkout BRANCHNAME
- * # No tag has been added yet tag HEAD with
- * git tag VERSION
- * git push --tags
- * make
- * # Publish the released tar ball
- * make publish
- * # Clean up the generated files:
- * make clean
-
-# bug reports #
-
-Bugs should be reported to the spin-kickstarts bugzilla component:
-
-https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/atomic-installer/lorax-configure-repo.tmpl
@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'\n%end\n"

--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -33,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos

 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/25/ --ref=fedora-atomic/25/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/24/ --ref=fedora-atomic/24/x86_64/docker-host

 reboot

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

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -32,9 +32,6 @@ dnf-yum
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image
 rsync
-# Add fuse-sshfs so that the vagrant-sshfs plugin won't have to
-# install it on boot. https://github.com/dustymabe/vagrant-sshfs
-fuse-sshfs
 %end

 %post --erroronfail
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -43,9 +43,6 @@ sssd-client
 %end

 %post --log=/tmp/anaconda-post.log
-
-set -e
-
 # Set the language rpm nodocs transaction flag persistently in the
 # image yum.conf and rpm macros

@@ -71,7 +68,6 @@ 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
@@ -80,6 +76,10 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*

+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
+
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -16,34 +16,6 @@ part / --size 14336
 # Switch to groups for design suite
@design-suite

-# Added addons to address rhbz#1336879 from dnf
-gimp-data-extras
-gimp-dbp
-gimp-dds
-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
-LuxRender-blender
-sane-backends-drivers-scanners
-xsane-gimp
-#YafaRay-blender
-
 # Preview Gnome Photos
 gnome-photos

@@ -67,7 +39,7 @@ f24-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'darktable.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'gnome-photos.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE

 # Add link to lists of tutorials
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -45,7 +45,7 @@ extremetuxracer
 freeciv
 freecol
 freedoom
-freedroidrpg
+# freedroidrpg cut for size
 frozen-bubble
 gl-117
 glob2
@@ -60,13 +60,13 @@ netpanzer
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
-# supertux # Crashing
+supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
-warmux
+# warmux - Cut for size
 xmoto

 # traditional (small)
Author	SHA1	Message	Date
Jason Brooks	7e4f164444	correct ostree repo location see: https://pagure.io/fedora-kickstarts/pull-request/38#comment-8056	2016-08-13 13:25:32 -05:00
Bruno Wolff III	1cdbd3ef07	Make sure chronyd runs with the correct config We need to have chronyd start after livesys has finished so that the config for chronyd gets rewritten before it starts. If not it will overwrite the system clock with a time that will be incorrect (US eastern stored as local time instead of UTC) for most people. This fixes bug 1018162.	2016-08-04 07:43:46 -05:00
Jason Brooks	e640139976	fix ostree repo location problem: fedora atomic host images are including an old ostree tree (24.39 from 2016-06-15 09:57:04) cause: The ostree repo specified in this file at: https://kojipkgs.fedoraproject.org/compose/atomic/24/ was last updated at 2016-06-15 09:57:04. Fedora Atomic 23 used the location: https://kojipkgs.fedoraproject.org/mash/atomic/23/. The ref at the similar https://kojipkgs.fedoraproject.org/mash/atomic/24/ was last modifed 2016-07-24. This seems to be the correct location. Or, if the switch from mash to compose is right, then we need to ensure that the compose location is updated / kept up to date.	2016-07-27 10:36:46 -07:00
Adam Miller	fb34ac6186	fix missing /run/lock in docker base image BZ#1343138 Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>	2016-07-22 16:04:40 -05:00
Dan Book	03020f4a74	Cinnamon - correct gnome metadata for extra backgrounds and add basic backgrounds	2016-06-07 21:03:21 -04:00
Kevin Fenzi	cd2ff0eea2	Drop dracut-config-generic since we don't want the larger generic initramfses on all installed from live instances. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2016-06-03 12:09:10 -07:00
Kalev Lember	ee9e070d75	packagekit-cached-metadata.ks: Adapt for livemedia-creator changes Now that F24 images are made with livemedia-creator instead of livecd-creator, the kickstart parser has changed; the new kickstart parser doesn't understand the $INSTALL_ROOT variable we'd been using in %post --nochroot scripts. This commit fixes this by replacing $INSTALL_ROOT usage with hardcoded /mnt/sysimage as docs suggest. While at this, this commit also fixes a case where resolv.conf would be incorrectly copied if it is a symlink, thanks to dgilmore for pointing this out.	2016-06-01 23:20:46 +02:00
Dennis Gilmore	a769fe0a58	install new arm-tools group to pull in tools for booting arm systems. Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-05-30 10:10:29 -05:00
Christian Dersch	dbf41eb0b0	astronomy: remove astronomy-bookmarks (outdated and affected by #1338010 )	2016-05-27 09:57:53 +02:00
Dennis Gilmore	f086a341da	add a default url line to the livecd kickstarts Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-05-23 09:36:29 -05:00
Christian Dersch	9714319110	astronomy: added plasma applet for redshift	2016-05-21 15:11:26 +02:00
Dusty Mabe	df302e6748	fedora-cloud-base: Add which package back. After removing grub2 the which package gets removed. Let's add it back because it is generally useful and because it is needed for many vagrant utilities to work.	2016-05-20 10:53:04 -04:00
Peter Robinson	558f5c6315	arm: add fedora-arm-installer	2016-05-17 13:51:48 +01:00
Peter Robinson	f0fdf7c568	cloud: ppc: add grub2 explicitly since now primary has explicitly removed it again	2016-05-17 12:04:21 +01:00
Christian Dersch	302f5ad386	astronomy: removed skychart, do not ship two complete Python stacks => removed python 2 scientific stuff	2016-05-16 14:09:42 +02:00
Dan Book	e891c467f0	remove unneeded keyring package; add yumex-dnf and extra backgrounds - gnome-keyring-pam is already required by cinnamon	2016-05-13 22:05:23 -05:00
Peter Robinson	6105897461	aarch64: fix cloud ks	2016-05-13 17:57:18 +01:00
raveit65	d003cb2a7d	Mate: add p7zip	2016-05-13 11:01:12 +02:00
Peter Robinson	f8593bceab	arm: minimal: add WiFi cli support	2016-05-12 16:33:02 +01:00
Peter Robinson	6eab7f1b6a	cloud: aarch64: fix console line	2016-05-12 08:47:30 +01:00
Peter Robinson	2264e6daa9	aarch64: cloud: explicitly add uEFI boot components	2016-05-10 16:36:34 +01:00
Christian Dersch	24e3e25f16	astronomy: added virtualplanet and redshift	2016-05-10 14:16:13 +02:00
raveit65	a4495045d0	Mate: use f24-backgrounds-extras-base	2016-05-10 11:10:52 +02:00
Luya Tshimbalanga	17bed3db91	design-suite: really enable gthumb	2016-05-04 19:39:43 -07:00
Adam Williamson	f4ee7648ad	Revert "cloud-base-vagrant: Add sshfs to support vagrant-sshfs plugin" This reverts commit `34a505db5c`. The package is not in the Cloud install root at present so this change made the image compose fail. This can be re-applied if the package is added to an appropriate comps group.	2016-05-03 22:54:53 -07:00
Dusty Mabe	3992f9ca91	cloud-base-vagrant: use extlinux to match cloud-base If we don't do this it will try to use grub2 but will fail because we removed the packages from the package set.	2016-05-03 17:36:30 -05:00
Dusty Mabe	34a505db5c	cloud-base-vagrant: Add sshfs to support vagrant-sshfs plugin Adding sshfs into the image will make it so that users won't have to wait for the package to be installed on bringup.	2016-05-03 17:35:16 -05:00
Luya Tshimbalanga	dc22ec46cb	design-suite: bring back f24-backgrounds-extras	2016-05-03 14:56:27 -07:00
Luya Tshimbalanga	dec45f8d97	design-suite: remove erronous typo	2016-05-03 10:25:03 -07:00
Kalev Lember	80d15bf8ba	packagekit-cached-metadata.ks: Update Branched and Rawhide repo URLs They changed with the switch to Pungi.	2016-05-03 15:16:50 +02:00
Luya Tshimbalanga	1ef06b2533	design-suite: temporary disable f24-backgrounds-extras for testing purpose	2016-05-02 11:16:30 -07:00
Bruno Wolff III	71fb82b5bc	Games: I still need to get the i686 size down another 100 MB Hopefully eventually Midori will get fixed, so firefox can be dropped and we'll find a way to get the i686 version not to be 400 MB larger than the x86_64 version.	2016-04-29 13:54:04 -05:00
Kevin Fenzi	11a93ac029	Add admin-tools group in. Fixes bug #1330298	2016-04-26 15:06:58 -06:00
Luya Tshimbalanga	4407d70045	Merge branch 'f24' of ssh://git.fedorahosted.org/git/spin-kickstarts into f24	2016-04-26 12:36:48 -07:00
Luya Tshimbalanga	ab8bfa2903	design-suite: add f24-backgrounds extras and switch geeqie to gthumb	2016-04-26 12:34:01 -07:00
Bruno Wolff III	37bbc185a5	Games also cut Ri-li for size	2016-04-25 00:19:04 -05:00
Bruno Wolff III	125b994038	Games: don't block firefox With no sign of midori getting fixed, let firefox get used for beta. The kernel / change to livemedia had more to do with the size problem, than firefox did. With the removal of freedroid and letting firefox go the size should be very close.	2016-04-24 23:54:51 -05:00
Bruno Wolff III	d9a3ca9946	Games: need to save 20MB on i686 With livemedia putting both PAE and non-PAE kernels on i686, i686 images are a lot bigger than x86_64 images and what i686 used to be. Removing freedroid looks to be enough.	2016-04-24 23:51:57 -05:00
Luya Tshimbalanga	1016065d6b	design-suite: add geeqie	2016-04-21 01:40:52 -07:00
Kushal Das	8c2a31f378	Pulls in the systemd-udev subpackage	2016-04-13 15:25:52 +05:30
Dennis Gilmore	e1206f4b9b	update the atomic cloud images for f24 Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-04-12 10:07:32 -05:00
Peter Robinson	7f13b20e33	Docker: Base: add arm config, use includes for ppc config	2016-04-12 15:44:02 +01:00
Peter Robinson	6226c24d43	Cloud: Base: add arm config, use includes for ppc config	2016-04-12 14:22:27 +01:00
Peter Robinson	b4d8fed0e8	SoaS: we don't want the WebKit gtk2 plugin support	2016-04-10 22:41:43 +01:00
raveit65	de041f9852	update fedora-mate-packages.ks	2016-04-09 17:12:51 +02:00
Peter Robinson	7b9bef18d0	SoaS: Don't include livecd-tools anymore	2016-03-30 14:57:07 +01:00
Kevin Fenzi	802b718d0d	Allow dracut-config-rescue to be installed so installed systems have a rescue kernel. Also remove the rescue kernel and initramfs on the live itself. Fixes bug #1317709	2016-03-25 12:37:29 -06:00
Christian Dersch	c4326802f6	astronomy: increased space	2016-03-24 20:53:12 +01:00
Peter Robinson	fb5d41231c	ppc: we need grub2 in cloud images	2016-03-24 17:25:05 +00:00
Peter Robinson	3d38aa7715	add PPC specific cloud kickstarts until anaconda rhbz 1303219 is fixed	2016-03-24 16:41:13 +00:00
Luya Tshimbalanga	5b062b29c6	desing-suite: increase recommended size	2016-03-23 23:37:01 -07:00
Dennis Gilmore	55890d6209	make the arm KDE image 6.5G, needs more space Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-14 20:34:33 -05:00
Dennis Gilmore	533fa0ccda	point at f24 repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-13 21:17:56 -05:00
Christian Dersch	c53c695e25	astronomy: added veusz to have a proper replacement for scidavis	2016-03-13 20:29:05 +01:00
Adam Williamson	23af1c94df	Revert "Revert "add @gnome-desktop to fedora-workstation-packages"" This reverts commit `a08e27a87d`. Requested by Michael Catanzaro, he is re-applying the Workstation comps group change that was reverted.	2016-03-12 10:27:35 -08:00
Bruno Wolff III	3ddd549ff7	Games: Don't pull in firefox to keep size down	2016-03-12 10:30:57 -06:00
Christian Dersch	92cbaff664	astronomy: removed broken xvarstar	2016-03-12 13:07:27 +01:00
raveit65	ef88d6ddbd	Mate: clean up fedora-mate-packages.ks	2016-03-12 00:30:02 +01:00
Kevin Fenzi	8c971991de	Switch default browser to firefox on Xfce	2016-03-10 13:18:53 -07:00
Rex Dieter	103d925e9b	kde-desktop: +qupzilla, use @firefox group	2016-03-08 07:08:14 -06:00
Peter Robinson	410101bd76	Nuke random seed in install for ARM images too, the new instance should make it's own. Fixes bug #1314879	2016-03-07 08:42:51 -06:00
Dennis Gilmore	179a268857	Revert "Merge branch 'master' into f24" This reverts commit `eead7177ab`, reversing changes made to `b9fcda35df`.	2016-03-07 08:40:39 -06:00
Christian Dersch	ccc8847b19	astronomy: kst fixed, added again	2016-03-06 13:57:45 +01:00
Peter Robinson	eead7177ab	Merge branch 'master' into f24	2016-03-05 17:44:39 +00:00
Kevin Fenzi	b9fcda35df	Nuke random seed in install, the new instance should make it's own. Fixes bug #1314879	2016-03-05 09:27:39 -07:00
Kalev Lember	f4e8f1bb0a	Revert "add @gnome-desktop to fedora-workstation-packages" @gnome-desktop addition was reverted in comps in commit db13483cc5bdb39b8d9f066e7706335fb9ae3048; this reverts it here too. This reverts commit `6b42371f72`.	2016-03-04 12:55:12 +01:00
Christian Dersch	9199268aed	astronomy: added LabPlot as replacement for retired scidavis	2016-03-03 17:54:58 +01:00
Dennis Gilmore	26768920ec	fedira install trees are now defined in pungi-fedora Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-03-02 11:16:55 -06:00
Christian Dersch	c254d4e73e	astronomy: disabled kst until dependency issue with gsl 2.1 is fixed	2016-03-02 01:32:13 +01:00
Dennis Gilmore	17862cd969	increate the size of some of teh arm images. the install was too big Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 21:00:21 -06:00
Dennis Gilmore	454fed4a4c	install only english support on the minimal arm image Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 20:49:57 -06:00
Dennis Gilmore	6da9e16e53	make sure we do not include the rawhide repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 14:31:30 -06:00
Dennis Gilmore	e8de8a9ce3	make sure that all the livecds and arm images have glibc-all-langpacks installed Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-29 14:21:30 -06:00
Dennis Gilmore	5d3551ec4c	remove file that does not belong in the repo Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-25 17:14:02 -06:00
Dennis Gilmore	777c11480e	make the arm base / 3070 LXDE was too big and this keeps the image under 4GiB Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2016-02-25 16:29:47 -06:00