forked from srbala/fedora-kickstarts
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.)
This commit is contained in:
parent
fb103a9edc
commit
8394644034
@ -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 = \
|
||||
|
0
fedoda-repo-rawhide.ks
Normal file
0
fedoda-repo-rawhide.ks
Normal file
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
0
fedora-repo-not-rawhide.ks
Normal file
0
fedora-repo-not-rawhide.ks
Normal file
9
fedora-repo.ks
Normal file
9
fedora-repo.ks
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user