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-09 00:20:31 +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
3 changed files with 9 additions and 5 deletions
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -33,7 +33,7 @@ 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/24/ --ref=fedora-atomic/24/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

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

@@ -83,6 +83,10 @@ sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

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

 %end
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -72,7 +72,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
-# X-Start-Before: display-manager
+# X-Start-Before: display-manager chronyd
 ### END INIT INFO

 . /etc/init.d/functions
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