diff options
| author | Bruno Wolff III <bruno@wolff.to> | 2013-06-29 08:05:30 -0500 |
|---|---|---|
| committer | Bruno Wolff III <bruno@wolff.to> | 2013-06-29 08:05:30 -0500 |
| commit | 8394644034c0298d6727c369957eacd62ea5ccf2 (patch) | |
| tree | 4fdb5ae7f6193c168a12d568c9601a02b8d8dfef | |
| parent | fb103a9edce734c7a65d5d1b02873b3cb7f14043 (diff) | |
| download | spin-kickstarts-8394644034c0298d6727c369957eacd62ea5ccf2.tar.gz spin-kickstarts-8394644034c0298d6727c369957eacd62ea5ccf2.tar.xz spin-kickstarts-8394644034c0298d6727c369957eacd62ea5ccf2.zip | |
Make it easier to handle branching
Now the switch between using the rawhide repo and the normal repos
can be done by just switching comment lines in one place
(fedora-repo.ks). (Note that the repo lines in fedora-install.ks
don't get changed for branching.)
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | fedoda-repo-rawhide.ks | 0 | ||||
| -rw-r--r-- | fedora-aos.ks | 5 | ||||
| -rw-r--r-- | fedora-arm-base.ks | 5 | ||||
| -rw-r--r-- | fedora-live-base.ks | 5 | ||||
| -rw-r--r-- | fedora-repo-not-rawhide.ks | 0 | ||||
| -rw-r--r-- | fedora-repo.ks | 9 |
7 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 4557d2e..13d3972 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,10 @@ fedora_DATA = \ fedora-livedvd-scientific-kde.ks \ fedora-livecd-security.ks \ fedora-live-jam-kde.ks \ - fedora-mate-packages.ks + fedora-mate-packages.ks \ + fedoda-repo-rawhide.ks \ + fedora-repo-not-rawhide.ks \ + fedora-repo.ks customdir = ${pkgdatadir}/custom/ custom_DATA = \ diff --git a/fedoda-repo-rawhide.ks b/fedoda-repo-rawhide.ks new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fedoda-repo-rawhide.ks diff --git a/fedora-aos.ks b/fedora-aos.ks index 9d93113..c42a916 100644 --- a/fedora-aos.ks +++ b/fedora-aos.ks @@ -26,10 +26,7 @@ part / --size 1024 --fstype ext4 --ondisk sda # # Repositories # -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch +%include fedora-repo.ks # # Add all the packages after the base packages diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 585c502..a9cf754 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -9,10 +9,7 @@ firstboot --reconfig services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch +%include fedora-repo.ks %packages @core diff --git a/fedora-live-base.ks b/fedora-live-base.ks index f8f1eea..4d3b129 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -17,10 +17,7 @@ xconfig --startxonboot part / --size 3072 --fstype ext4 services --enabled=NetworkManager --disabled=network,sshd -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch -#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch +%include fedora-repo.ks %packages @base-x diff --git a/fedora-repo-not-rawhide.ks b/fedora-repo-not-rawhide.ks new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/fedora-repo-not-rawhide.ks diff --git a/fedora-repo.ks b/fedora-repo.ks new file mode 100644 index 0000000..9631967 --- /dev/null +++ b/fedora-repo.ks @@ -0,0 +1,9 @@ +# Include the appropriate repo definitions + +# Exactly one of the following should be uncommented + +# For the master branch the following should be uncommented +%include fedora-repo-rawhide.ks + +# For non-master branches the following should be uncommented +# %include fedora-repo-non-rawhide.ks |