Compare commits
80 Commits
Author | SHA1 | Date |
---|---|---|
raveit65 | b5bfeaf8f3 | |
Luke Macken | 885bef6712 | |
raveit65 | 6e53fc1a51 | |
raveit65 | 0a408bc655 | |
Rex Dieter | c033c03c08 | |
Rex Dieter | 16a5bf2a4d | |
Colin Walters | 6ef2d02a30 | |
Luya Tshimbalanga | b8947535a2 | |
Luya Tshimbalanga | 72a583d4a4 | |
Colin Walters | 7a6f83699b | |
Rex Dieter | 76d2df7147 | |
Rex Dieter | 1fd1f6d138 | |
Rex Dieter | 94ab41ccd3 | |
Rex Dieter | 5f90422b0e | |
Kalev Lember | c7094bf8ab | |
Peter Robinson | 906bbfee12 | |
Peter Robinson | a9325d0503 | |
Colin Walters | 0a2751d382 | |
Luya Tshimbalanga | 782967ccba | |
Dennis Gilmore | cd947e0c4a | |
Dennis Gilmore | e17d3d0ba4 | |
Peter Robinson | 1c25cb6171 | |
Ian McLeod | e171dabdc5 | |
Stephen Gallagher | d7ef245b83 | |
Dan Horák | 48296d16ae | |
Kushal Das | b71f67490e | |
raveit65 | 9308b5da94 | |
raveit65 | 500b85c343 | |
Colin Walters | 7f06442f8f | |
Luya Tshimbalanga | 02e041303b | |
Bruno Wolff III | 5cb276a2f1 | |
Colin Walters | 7fcc4df93a | |
Colin Walters | cde583e3a2 | |
Dennis Gilmore | 9245751e67 | |
Colin Walters | 5e9e250c1d | |
Colin Walters | ba3bedacb3 | |
Colin Walters | cd820f7630 | |
Colin Walters | fb6bcce1be | |
Colin Walters | d7d0e5ad95 | |
Brendan Jones | 9fa38d0117 | |
Matthew Miller | cf9444b682 | |
Colin Walters | bfc2901422 | |
Colin Walters | 47ab710fe2 | |
Dennis Gilmore | 0959478eab | |
Dennis Gilmore | 427657159d | |
Rex Dieter | dbe507bd91 | |
Rex Dieter | 0b6884a62e | |
Rex Dieter | 3677a24bd9 | |
Brendan Jones | 4675f6f6fd | |
raveit65 | 2bd8c367cf | |
luya | a7d928767c | |
luya | f7d3da2878 | |
luya | 131565566b | |
raveit65 | d4d001c549 | |
Dennis Gilmore | db8c33a53f | |
Kevin Fenzi | 16b8801b8e | |
Colin Walters | 264303aac1 | |
Amit Saha | 7c328c9965 | |
Adam Williamson | 66b3b50b89 | |
Colin Walters | 341e2f56f9 | |
raveit65 | b1c14531ce | |
Luya Tshimbalanga | 9c52c11e9a | |
Luya Tshimbalanga | 37dc4aa02f | |
Luya Tshimbalanga | a8e9553e5c | |
Kevin Kofler | 75e15f1dd2 | |
Colin Walters | 9eed55b9e5 | |
Dennis Gilmore | eae3708bca | |
Colin Walters | ee4bc19ae7 | |
Colin Walters | 51d4c8ee45 | |
luya | 9defdef6cd | |
Stephen Gallagher | efab044d00 | |
Adam Williamson | 13f09fe7d6 | |
Fabian Affolter | 38321a2d35 | |
Dennis Gilmore | b5ab8fc9bb | |
Dennis Gilmore | 6881942927 | |
Bruno Wolff III | c00926fcb5 | |
Kevin Fenzi | 66c69f4243 | |
Peter Robinson | 6633c8f661 | |
Dennis Gilmore | 84b8cd7926 | |
Dennis Gilmore | f1cfec3f1b |
|
@ -0,0 +1,8 @@
|
|||
## Lorax template to configure Anaconda to use the local OSTree
|
||||
## repository on disk.
|
||||
|
||||
<%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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
## Lorax template to embed an OSTree repository into the installer.iso
|
||||
## and configure an interactive installer use to look for it.
|
||||
##
|
||||
## Note that we pull with depth=0 to only get *one* commit into the
|
||||
## ISO, because we obviously don't want the full history.
|
||||
|
||||
<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
|
||||
runcmd mkdir -p ${workdir}/iso-graft/content/repo
|
||||
runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
|
||||
runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
|
||||
runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}
|
|
@ -23,7 +23,6 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
|
|||
@standard
|
||||
@hardware-support
|
||||
@dial-up
|
||||
@fedora-release-nonproduct
|
||||
|
||||
kernel
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
%include fedora-arm-base.ks
|
||||
|
||||
part swap --size=128 --fstype swap
|
||||
part / --size=1400 --fstype ext4
|
||||
part /boot --size=300 --fstype ext3
|
||||
part swap --size=256 --fstype swap
|
||||
part / --size=1200 --fstype ext4
|
||||
|
||||
%packages
|
||||
-@standard
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
%include fedora-arm-base.ks
|
||||
|
||||
# server defaults to xfs for / so lets do so on arm also
|
||||
part / --size=3000 --fstype xfs
|
||||
|
||||
%packages
|
||||
-@dial-up
|
||||
# install the default groups for the server evironment since installing the environment is not working
|
||||
@server-product
|
||||
@standard
|
||||
@headless-management
|
||||
@container-management
|
||||
@domain-client
|
||||
-initial-setup-gui
|
||||
-generic-release*
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
# setup systemd to boot to the right runlevel
|
||||
echo -n "Setting default runlevel to multiuser text mode"
|
||||
rm -f /etc/systemd/system/default.target
|
||||
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
|
||||
echo .
|
||||
|
||||
echo -n "Enabling initial-setup text mode on startup"
|
||||
ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
|
||||
echo .
|
||||
|
||||
%end
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
%include fedora-arm-base.ks
|
||||
%include fedora-arm-xbase.ks
|
||||
%include fedora-xfce-packages.ks
|
||||
part / --size=3500 --fstype ext4
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
|
||||
# https://fedoraproject.org/wiki/Changes/AtomicHost
|
||||
|
||||
lang en_US.UTF-8
|
||||
keyboard us
|
||||
timezone America/New_York
|
||||
zerombr
|
||||
clearpart --all --initlabel
|
||||
rootpw --lock --iscrypted locked
|
||||
user --name=none
|
||||
bootloader --timeout=1
|
||||
network --bootproto=dhcp --device=link --activate
|
||||
# We are only able to install atomic with separate /boot partition currently
|
||||
part / --fstype="ext4" --size=6000
|
||||
part /boot --size=500 --fstype="ext4"
|
||||
shutdown
|
||||
services --disabled=docker-storage-setup,network
|
||||
services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
|
||||
|
||||
%post
|
||||
|
||||
# Ensure the root password is locked, we use cloud-init
|
||||
passwd -l root
|
||||
userdel -r none
|
||||
|
||||
# We copy content of separate /boot partition to root part when building live squashfs image,
|
||||
# and we don't want systemd to try to mount it when pxe booting
|
||||
cat /dev/null > /etc/fstab
|
||||
%end
|
|
@ -0,0 +1,28 @@
|
|||
# Like the Atomic cloud image, but tuned for vagrant. Enable
|
||||
# the vagrant user, disable cloud-init.
|
||||
|
||||
%include fedora-cloud-atomic.ks
|
||||
|
||||
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
user --name=vagrant --password=vagrant
|
||||
|
||||
%post --erroronfail
|
||||
|
||||
# Work around cloud-init being both disabled and enabled; need
|
||||
# to refactor to a common base.
|
||||
systemctl mask cloud-init cloud-init-local cloud-config cloud-final
|
||||
|
||||
# Vagrant setup
|
||||
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
|
||||
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
|
||||
mkdir -m 0700 -p ~vagrant/.ssh
|
||||
cat > ~vagrant/.ssh/authorized_keys << EOKEYS
|
||||
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
|
||||
EOKEYS
|
||||
chmod 600 ~vagrant/.ssh/authorized_keys
|
||||
chown -R vagrant:vagrant ~vagrant/.ssh/
|
||||
|
||||
%end
|
||||
|
|
@ -1,8 +1,10 @@
|
|||
# Fedora Atomic is a cloud-focused spin implementing the Project Atomic
|
||||
# patterns.
|
||||
#
|
||||
# RIGHT NOW, this is very like the traditional cloud image -- this is
|
||||
# just a starting point.
|
||||
# Fedora Atomic is a cloud-focused spin implementing the Project
|
||||
# Atomic patterns. Note that this replicates the same tree which can
|
||||
# now be installed on bare metal.
|
||||
|
||||
# This image allocates most space to an LVM-managed thin pool
|
||||
# dedicated for Docker containers, and uses docker-storage-setup to
|
||||
# dynamically resize storage on boot.
|
||||
|
||||
text
|
||||
lang en_US.UTF-8
|
||||
|
@ -19,7 +21,8 @@ firewall --disabled
|
|||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
|
||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
services --disabled=network
|
||||
services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
|
@ -30,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=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
|
||||
ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
|
||||
|
||||
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
||||
|
@ -45,6 +48,10 @@ passwd -l root
|
|||
# remove the user anaconda forces us to make
|
||||
userdel -r none
|
||||
|
||||
# We can lead the way with the internal DHCP, see
|
||||
# https://lists.fedoraproject.org/pipermail/cloud/2015-March/005119.html
|
||||
echo "dhcp=internal" >> /etc/NetworkManager/NetworkManager.conf
|
||||
|
||||
echo -n "Getty fixes"
|
||||
# although we want console output going to the serial console, we don't
|
||||
# actually have the opportunity to login there. FIX.
|
||||
|
@ -52,13 +59,6 @@ echo -n "Getty fixes"
|
|||
sed -i '/^#NAutoVTs=.*/ a\
|
||||
NAutoVTs=0' /etc/systemd/logind.conf
|
||||
|
||||
echo -n "Network fixes"
|
||||
# initscripts don't like this file to be missing.
|
||||
cat > /etc/sysconfig/network << EOF
|
||||
NETWORKING=yes
|
||||
NOZEROCONF=yes
|
||||
EOF
|
||||
|
||||
# For cloud images, 'eth0' _is_ the predictable device name, since
|
||||
# we don't want to be tied to specific virtual (!) hardware
|
||||
rm -f /etc/udev/rules.d/70*
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
# Like the Cloud Base image, but tuned for vagrant. Enable
|
||||
# the vagrant user, disable cloud-init.
|
||||
|
||||
%include fedora-cloud-base.ks
|
||||
|
||||
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
# So, to be clear, this gaping security hole is an integral part of how
|
||||
# Vagrant works - These images are _not_ supposed to be run in any public-
|
||||
# Internet facing way - They are for use on developer setups, almost always
|
||||
# with NAT
|
||||
user --name=vagrant --password=vagrant
|
||||
|
||||
# Suggestion from @purpleidea that most/many vagrant boxes also set root PW
|
||||
# to "vagrant" for ease of use. Again, see comments above.
|
||||
rootpw vagrant
|
||||
|
||||
# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
|
||||
# even on VirtualBox virt, we get a primary network device with "eth0" as the name
|
||||
# This simplifies things and allows a single disk image for both supported Vagrant
|
||||
# platforms (virtualbox and kvm)
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
|
||||
|
||||
%packages
|
||||
# The default koji Vagrantfile configuration uses rsync to sync files between
|
||||
# the vagrant host and the guest. It uses yum to verify that rsync is present
|
||||
# and/or install it if it is not. It will fail without adding the yum compat
|
||||
# layer for dnf
|
||||
# TODO: Teach vagrant about dnf
|
||||
dnf-yum
|
||||
%end
|
||||
|
||||
%post --erroronfail
|
||||
|
||||
# Work around cloud-init being both disabled and enabled; need
|
||||
# to refactor to a common base.
|
||||
systemctl mask cloud-init cloud-init-local cloud-config cloud-final
|
||||
|
||||
# Vagrant setup
|
||||
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
|
||||
echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
|
||||
sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
|
||||
mkdir -m 0700 -p ~vagrant/.ssh
|
||||
cat > ~vagrant/.ssh/authorized_keys << EOKEYS
|
||||
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
|
||||
EOKEYS
|
||||
chmod 600 ~vagrant/.ssh/authorized_keys
|
||||
chown -R vagrant:vagrant ~vagrant/.ssh/
|
||||
|
||||
# Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
|
||||
mkdir -m 0700 -p /root/.ssh
|
||||
cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
|
||||
chmod 600 /root/.ssh/authorized_keys
|
||||
chown -R root:root /root/.ssh
|
||||
|
||||
%end
|
||||
|
|
@ -142,9 +142,11 @@ NAutoVTs=0' /etc/systemd/logind.conf
|
|||
|
||||
echo -n "Network fixes"
|
||||
# initscripts don't like this file to be missing.
|
||||
# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
|
||||
cat > /etc/sysconfig/network << EOF
|
||||
NETWORKING=yes
|
||||
NOZEROCONF=yes
|
||||
DEVTIMEOUT=10
|
||||
EOF
|
||||
|
||||
# For cloud images, 'eth0' _is_ the predictable device name, since
|
||||
|
|
|
@ -2,14 +2,26 @@
|
|||
#
|
||||
# To keep this image minimal it only installs English language. You need to change
|
||||
# yum configuration in order to enable other languages.
|
||||
#
|
||||
### Hacking on this image ###
|
||||
# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
|
||||
# but you can run imagefactory locally too.
|
||||
#
|
||||
# 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
|
||||
#
|
||||
|
||||
cmdline
|
||||
bootloader --location=none
|
||||
bootloader --disabled
|
||||
timezone --isUtc --nontp Etc/UTC
|
||||
rootpw --plaintext qweqwe
|
||||
rootpw --lock --iscrypted locked
|
||||
user --name=none
|
||||
|
||||
keyboard us
|
||||
firewall --disable
|
||||
zerombr
|
||||
clearpart --all
|
||||
part / --size 3000 --fstype ext4
|
||||
|
@ -21,7 +33,8 @@ bash
|
|||
fedora-release
|
||||
rootfiles
|
||||
vim-minimal
|
||||
yum
|
||||
dnf
|
||||
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
|
||||
#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
|
||||
-kernel
|
||||
|
||||
|
@ -32,6 +45,9 @@ yum
|
|||
# Set the language rpm nodocs transaction flag persistently in the
|
||||
# image yum.conf and rpm macros
|
||||
|
||||
# remove the user anaconda forces us to make
|
||||
userdel -r none
|
||||
|
||||
LANG="en_US"
|
||||
echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
|
||||
|
||||
|
|
|
@ -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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
|
||||
# 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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
|
||||
|
||||
# Package manifest for the compose. Uses repo group metadata to translate groups.
|
||||
# (default groups for the configured repos are added by --default)
|
||||
|
|
|
@ -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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
|
||||
# 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
|
||||
|
||||
# Package manifest for the compose. Uses repo group metadata to translate groups.
|
||||
# (default groups for the configured repos are added by --default)
|
||||
|
@ -72,13 +72,6 @@ dracut-*
|
|||
@core
|
||||
@hardware-support
|
||||
|
||||
# Some development tools
|
||||
@development-libs
|
||||
@development-tools
|
||||
@c-development
|
||||
@rpm-development-tools
|
||||
@fedora-packager
|
||||
|
||||
# Fedora Server.
|
||||
# Including this causes the fedora-release-server package to be included,
|
||||
# which in turn enables server-product-environment, and due to to its priority
|
||||
|
@ -88,6 +81,7 @@ dracut-*
|
|||
@headless-management
|
||||
@container-management
|
||||
@domain-client
|
||||
@server-hardware-support
|
||||
|
||||
# Common server packages
|
||||
@mysql
|
||||
|
|
|
@ -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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
|
||||
# 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
|
||||
|
||||
%include fedora-workstation-packages.ks
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ auth --useshadow --enablemd5
|
|||
selinux --enforcing
|
||||
firewall --enabled --service=mdns
|
||||
xconfig --startxonboot
|
||||
part / --size 3072 --fstype ext4
|
||||
part / --size 4096 --fstype ext4
|
||||
services --enabled=NetworkManager --disabled=network,sshd
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
@ -24,7 +24,6 @@ services --enabled=NetworkManager --disabled=network,sshd
|
|||
@guest-desktop-agents
|
||||
@standard
|
||||
@core
|
||||
@fedora-release-nonproduct
|
||||
@fonts
|
||||
@input-methods
|
||||
@dial-up
|
||||
|
@ -305,6 +304,9 @@ if [ -x /usr/bin/fc-cache ] ; then
|
|||
fc-cache -f
|
||||
fi
|
||||
|
||||
echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
||||
| tee /etc/.updated >/var/.updated
|
||||
|
||||
%end
|
||||
|
||||
|
||||
|
|
|
@ -13,14 +13,11 @@
|
|||
part / --size 8192
|
||||
|
||||
%packages
|
||||
|
||||
# graphics
|
||||
blender
|
||||
LuxRender-blender
|
||||
YafaRay-blender
|
||||
bluefish
|
||||
#cinepaint
|
||||
#cmyktool
|
||||
colord-extra-profiles
|
||||
darktable
|
||||
dia
|
||||
|
@ -75,7 +72,7 @@ aajohan-comfortaa-fonts
|
|||
adobe-source-sans-pro-fonts
|
||||
campivisivi-titillium-fonts
|
||||
lato-fonts
|
||||
opens-sans-fonts
|
||||
open-sans-fonts
|
||||
overpass-fonts
|
||||
|
||||
# removal of unneeded applications
|
||||
|
@ -107,10 +104,38 @@ Categories=Graphics;Documentation;
|
|||
FOE
|
||||
chmod a+x /usr/share/applications/list-design-tutorials.desktop
|
||||
|
||||
# Add information about Fedora Design Suite
|
||||
cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
|
||||
[Desktop Entry]
|
||||
Name=Design Suite Info
|
||||
GenericName=About Design Suite
|
||||
Comment=Wiki page of Design Suite
|
||||
Name=About Design Suite
|
||||
GenericName=About Design Suite
|
||||
Comment=Wiki page of Design Suite
|
||||
Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
|
||||
Type=Application
|
||||
Icon=applications-internet
|
||||
Categories=Documentation;
|
||||
FOE
|
||||
chmod a+x /usr/share/applications/fedora-design-suite.desktop
|
||||
|
||||
# Add information about Fedora Design Team
|
||||
cat >> /usr/share/applications/fedora-design-team.desktop << FOE
|
||||
[Desktop Entry]
|
||||
Name=Design Team Info
|
||||
GenericName=About Design Team
|
||||
Name=About Design Team
|
||||
GenericName=About Design Team Wiki Page
|
||||
Comment=Wiki page of Design Team
|
||||
Exec=xdg-open http://fedoraproject.org/wiki/Design
|
||||
Type=Application
|
||||
Icon=applications-internet
|
||||
Categories=Documentation;
|
||||
FOE
|
||||
chmod a+x /usr/share/applications/fedora-design-team.desktop
|
||||
|
||||
# rebuild schema cache with any overrides we installed
|
||||
glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||
|
||||
#EOF
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -199,12 +199,12 @@ thunderbird
|
|||
%post
|
||||
|
||||
#setup kickoff favorites
|
||||
/bin/mkdir -p /etc/skel/.kde/share/config
|
||||
/bin/mkdir -p /etc/skel/.config
|
||||
|
||||
JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
|
||||
JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
|
||||
JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
|
||||
|
||||
cat <<EOF >> /etc/skel/.kde/share/config/kickoffrc
|
||||
cat <<EOF >> /etc/skel/.config/kickoffrc
|
||||
[Favorites]
|
||||
FavoriteURLs=$JAMFAVORITES
|
||||
EOF
|
||||
|
|
|
@ -13,16 +13,16 @@ DESKTOP="KDE"
|
|||
DISPLAYMANAGER="KDE"
|
||||
EOF
|
||||
|
||||
# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
|
||||
# set default GTK+ theme for root (see #683855, #689070, #808062)
|
||||
cat > /root/.gtkrc-2.0 << EOF
|
||||
include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
|
||||
include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
|
||||
include "/etc/gtk-2.0/gtkrc"
|
||||
gtk-theme-name="oxygen-gtk"
|
||||
gtk-theme-name="Adwaita"
|
||||
EOF
|
||||
mkdir -p /root/.config/gtk-3.0
|
||||
cat > /root/.config/gtk-3.0/settings.ini << EOF
|
||||
[Settings]
|
||||
gtk-theme-name = oxygen-gtk
|
||||
gtk-theme-name = Adwaita
|
||||
EOF
|
||||
|
||||
# add initscript
|
||||
|
@ -42,20 +42,20 @@ chown liveuser:liveuser /home/liveuser/.xsession
|
|||
# set up autologin for user liveuser
|
||||
if [ -f /etc/sddm.conf ]; then
|
||||
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
|
||||
sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
|
||||
sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
|
||||
else
|
||||
cat > /etc/sddm.conf << SDDM_EOF
|
||||
[Autologin]
|
||||
User=liveuser
|
||||
Session=kde-plasma.desktop
|
||||
Session=plasma.desktop
|
||||
SDDM_EOF
|
||||
fi
|
||||
|
||||
# add liveinst.desktop to favorites menu
|
||||
mkdir -p /home/liveuser/.kde/share/config/
|
||||
cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
|
||||
mkdir -p /home/liveuser/.config/
|
||||
cat > /home/liveuser/.config/kickoffrc << MENU_EOF
|
||||
[Favorites]
|
||||
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
|
||||
FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
|
||||
MENU_EOF
|
||||
|
||||
# show liveinst.desktop on desktop and in menu
|
||||
|
@ -80,23 +80,13 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
|
|||
Driver=QSQLITE3
|
||||
AKONADI_EOF
|
||||
|
||||
# Disable the update notifications of apper
|
||||
cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
|
||||
[CheckUpdate]
|
||||
autoUpdate=0
|
||||
distroUpgrade=0
|
||||
interval=0
|
||||
APPER_EOF
|
||||
|
||||
# Disable some kded modules
|
||||
# apperd: http://bugzilla.redhat.com/948099
|
||||
cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
|
||||
[Module-apperd]
|
||||
autoload=false
|
||||
KDEDRC_EOF
|
||||
# Disable plasma-pk-updates
|
||||
sed -i \
|
||||
-e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
|
||||
/usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
|
||||
|
||||
# Disable baloo
|
||||
cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
|
||||
cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
|
||||
[Basic Settings]
|
||||
Indexing-Enabled=false
|
||||
BALOO_EOF
|
||||
|
@ -107,24 +97,10 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
|
|||
Enabled=false
|
||||
KRES_EOF
|
||||
|
||||
# Disable nepomuk
|
||||
cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
|
||||
[Basic Settings]
|
||||
Start Nepomuk=false
|
||||
|
||||
[Service-nepomukfileindexer]
|
||||
autostart=false
|
||||
NEPOMUK_EOF
|
||||
|
||||
# make sure to set the right permissions and selinux contexts
|
||||
chown -R liveuser:liveuser /home/liveuser/
|
||||
restorecon -R /home/liveuser/
|
||||
|
||||
# small hack to enable plasma-netbook workspace on boot
|
||||
if strstr "\`cat /proc/cmdline\`" netbook ; then
|
||||
mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
|
||||
sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
|
||||
fi
|
||||
EOF
|
||||
|
||||
%end
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
%include fedora-live-base.ks
|
||||
%include fedora-mate-packages.ks
|
||||
|
||||
part / --size 4096
|
||||
part / --size 6144
|
||||
|
||||
%post
|
||||
cat >> /etc/rc.d/init.d/livesys << EOF
|
||||
|
|
|
@ -12,17 +12,30 @@
|
|||
caja-actions
|
||||
mate-disk-usage-analyzer
|
||||
mate-netspeed
|
||||
mate-themes-extras
|
||||
|
||||
# more backgrounds
|
||||
f22-backgrounds-mate
|
||||
f21-backgrounds-extras-base
|
||||
f21-backgrounds-extras-mate
|
||||
|
||||
# system tools
|
||||
system-config-printer
|
||||
system-config-printer-applet
|
||||
|
||||
# office
|
||||
@libreoffice
|
||||
|
||||
# audio player
|
||||
audacious
|
||||
# dsl tools
|
||||
rp-pppoe
|
||||
|
||||
# First, no office
|
||||
-planner
|
||||
# audio video
|
||||
parole
|
||||
exaile
|
||||
PackageKit-gstreamer-plugin
|
||||
|
||||
# blacklist applications who breaks mate desktop
|
||||
-audacious
|
||||
|
||||
# Drop things for size
|
||||
-@3d-printing
|
||||
|
@ -30,8 +43,6 @@ audacious
|
|||
-bluez
|
||||
-bluez-cups
|
||||
-colord
|
||||
-@dial-up
|
||||
-espeak
|
||||
-fedora-icon-theme
|
||||
-GConf2
|
||||
-gnome-bluetooth-libs
|
||||
|
@ -39,69 +50,28 @@ audacious
|
|||
-gnome-icon-theme-symbolic
|
||||
-gnome-software
|
||||
-gnome-themes
|
||||
-gnome-themes-standard
|
||||
-gnome-user-docs
|
||||
-gstreamer1-plugins-good
|
||||
-gstreamer1-plugins-bad-free
|
||||
-gstreamer-plugins-good
|
||||
-gstreamer-plugins-bad-free
|
||||
-gstreamer-plugins-espeak
|
||||
-@guest-desktop-agents
|
||||
-@libreoffice
|
||||
|
||||
-@mate-applications
|
||||
-mate-icon-theme-faenza
|
||||
-NetworkManager-bluetooth
|
||||
-samba-client
|
||||
-ibus-chewing
|
||||
-libical
|
||||
-OpenEXR-libs
|
||||
|
||||
# Drop oversized fonts that aren't needed
|
||||
-gnu-free-mono-fonts
|
||||
-gnu-free-fonts-common
|
||||
-gnu-free-serif-fonts
|
||||
-gnu-free-sans-fonts
|
||||
-stix-fonts
|
||||
|
||||
# Drop the Java plugin
|
||||
-icedtea-web
|
||||
-java-1.8.0-openjdk
|
||||
|
||||
# Drop things that pull in perl
|
||||
-linux-atm
|
||||
|
||||
# Dictionaries are big
|
||||
# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
|
||||
# strong preference to giving it a go on #fedora-desktop.
|
||||
# also see http://bugzilla.gnome.org/681084
|
||||
-aspell-*
|
||||
-man-pages*
|
||||
-words
|
||||
|
||||
# Help and art can be big, too
|
||||
-gnome-user-docs
|
||||
-evolution-help
|
||||
-desktop-backgrounds-basic
|
||||
-*backgrounds-extras
|
||||
|
||||
# Legacy cmdline things we don't want
|
||||
-krb5-auth-dialog
|
||||
-krb5-workstation
|
||||
-pam_krb5
|
||||
|
||||
-minicom
|
||||
|
||||
-jwhois
|
||||
-mtr
|
||||
-pinfo
|
||||
-rsh
|
||||
-ypbind
|
||||
-yp-tools
|
||||
-ntsysv
|
||||
|
||||
# Drop some system-config things
|
||||
-system-config-rootpassword
|
||||
-system-config-services
|
||||
-policycoreutils-gui
|
||||
-telnet
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -75,7 +75,6 @@ gnome-keyring-pam
|
|||
-packETH
|
||||
-pads
|
||||
-pdfcrack
|
||||
-picviz-gui
|
||||
-proxychains
|
||||
-pyrit
|
||||
-raddump
|
||||
|
@ -88,9 +87,7 @@ gnome-keyring-pam
|
|||
-tcpreplay
|
||||
-tripwire
|
||||
-wipe
|
||||
|
||||
# Is not available for OpenVAS-7. No longer supported by upstream.
|
||||
-openvas-client
|
||||
-zmap
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
@ -1,59 +0,0 @@
|
|||
# Description : Live DVD image for Fedora/Free Electronic Lab
|
||||
#
|
||||
# Maintainer(s):
|
||||
# - Chitlesh Goorah <chitlesh a fedoraproject.org>
|
||||
# - Thibault North <tnorth a fedoraproject.org>
|
||||
|
||||
%include fedora-live-workstation.ks
|
||||
|
||||
# DVD payload
|
||||
part / --size 10240
|
||||
|
||||
%packages
|
||||
|
||||
@electronic-lab
|
||||
|
||||
# Support for the Milkymist hardware community
|
||||
@milkymist
|
||||
|
||||
|
||||
# Office
|
||||
dia
|
||||
vym
|
||||
libreoffice-writer
|
||||
libreoffice-calc
|
||||
libreoffice-impress
|
||||
#libreoffice-extendedPDF
|
||||
planner
|
||||
graphviz
|
||||
|
||||
|
||||
# debugging tools
|
||||
make
|
||||
gdb
|
||||
valgrind
|
||||
kdbg
|
||||
wireshark-gnome
|
||||
qemu
|
||||
|
||||
|
||||
# EDA/CAD department
|
||||
perl-Test-Pod
|
||||
perl-Test-Pod-Coverage
|
||||
|
||||
|
||||
# Removing unnecessary packages from the desktop spin
|
||||
-abiword
|
||||
-@games
|
||||
-gimp
|
||||
-gimp-libs
|
||||
-gimp-data-extras
|
||||
-kdebluetooth
|
||||
-kbluetooth
|
||||
-rdesktop
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
%end
|
|
@ -171,6 +171,10 @@ hevea
|
|||
#Include Mozilla Firefox
|
||||
firefox
|
||||
|
||||
# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
|
||||
-kde-l10n-*
|
||||
-calligra-l10n-*
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
|
|
|
@ -17,7 +17,6 @@ ccsm
|
|||
emerald-themes
|
||||
emerald
|
||||
fusion-icon
|
||||
fusion-icon-gtk
|
||||
@libreoffice
|
||||
@networkmanager-submodules
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
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
|
||||
repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
|
||||
#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
|
||||
|
|
|
@ -1 +1 @@
|
|||
repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
|
||||
repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
|
||||
|
|
|
@ -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-not-rawhide.ks
|
||||
%include fedora-repo-not-rawhide.ks
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# Exclude unwanted groups that fedora-live-base.ks pulls in
|
||||
-@dial-up
|
||||
-@fedora-release-nonproduct
|
||||
-@input-methods
|
||||
-@standard
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@ gnome-keyring-pam
|
|||
# Add some screensavers, people seem to like them
|
||||
# Note that blank is still default.
|
||||
xscreensaver-extras
|
||||
wget
|
||||
system-config-printer
|
||||
|
||||
# save some space
|
||||
-autofs
|
||||
|
|
Loading…
Reference in New Issue