[spin-kickstarts] make fedora-repo.ks consistent with the actual filename
by Adam Williamson
commit 1f12485e4219724f6759e91b73cf3f10ca6218b5
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Aug 21 16:50:07 2013 -0700
make fedora-repo.ks consistent with the actual filename
fedora-repo.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-repo.ks b/fedora-repo.ks
index 9631967..9c7dfff 100644
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -6,4 +6,4 @@
%include fedora-repo-rawhide.ks
# For non-master branches the following should be uncommented
-# %include fedora-repo-non-rawhide.ks
+# %include fedora-repo-not-rawhide.ks
10 years, 8 months
spin-kickstarts branched
by Bruno Wolff III
I have made an f20 branch of spin-kickstarts. New changes should generally
be applied to master and cherry-picked backed to f20 from now until
the f20 release. (f20 and master have different repos active and doing
a merge between master and f20 will break this, so don't do that.)
I also have made post branch package builds for f20 and rawhide.
I am not sure when nightlies will switch to using the f20 branch instead
of master, but probably pretty soon.
10 years, 8 months
[spin-kickstarts] Use the higher tag when there are more than one
by Bruno Wolff III
commit 2be322d62679f384dd7f15fdc1ccf5b675d3954c
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Aug 20 21:44:29 2013 -0500
Use the higher tag when there are more than one
If two or more tags of the right format point point to
HEAD, we probably want the later of the two.
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/Makefile b/Makefile
index ca8011b..853b317 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
# Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
+version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
# And if it wasn't use a git hash
ifeq ($(version),)
version := $(shell git log -1 --abbrev=8 --pretty=git%h)
10 years, 8 months
[spin-kickstarts] Created tag 0.21.0
by Bruno Wolff III
The lightweight tag '0.21.0' was created pointing to:
11631d6... move the 'livesys is done' block back up so it's at least i
10 years, 8 months
[spin-kickstarts/f20] Switch over repos for branch
by Bruno Wolff III
commit 6ac1f9902433d3c378b87b3fed4c5ab4491eae1f
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Aug 20 21:31:04 2013 -0500
Switch over repos for branch
fedora-install-fedora.ks | 8 ++++----
fedora-repo.ks | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 35996eb..0ec1eeb 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -16,12 +16,12 @@
# use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
# In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
# Package manifest for the compose. Uses repo group metadata to translate groups.
# (default groups for the configured repos are added by --default)
diff --git a/fedora-repo.ks b/fedora-repo.ks
index 9631967..5887323 100644
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
# Exactly one of the following should be uncommented
# For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks
# For non-master branches the following should be uncommented
-# %include fedora-repo-non-rawhide.ks
+%include fedora-repo-non-rawhide.ks
10 years, 8 months
[spin-kickstarts] move the 'livesys is done' block back up so it's at least inside livesys
by Adam Williamson
commit 11631d64815c3f0174e37f7a16f8702221099fb5
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue Aug 20 08:50:39 2013 -0700
move the 'livesys is done' block back up so it's at least inside livesys
fedora-live-base.ks | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 6c76e96..09a2bb0 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -202,6 +202,9 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
systemctl stop crond.service 2> /dev/null || :
systemctl stop atd.service 2> /dev/null || :
+# Mark things as configured
+touch /.liveimg-configured
+
EOF
# bah, hal starts way too late
@@ -287,9 +290,6 @@ rm -f /boot/initramfs*
# make sure there aren't core files lying around
rm -f /core*
-# Mark things as configured
-touch /.liveimg-configured
-
# convince readahead not to collect
# FIXME: for systemd
10 years, 8 months
