Compare commits
77 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a550d62548 | ||
|
7afda9537f | ||
|
7e4f164444 | ||
|
1cdbd3ef07 | ||
|
|
e640139976 | ||
|
|
fb34ac6186 | ||
|
03020f4a74 | ||
|
cd2ff0eea2 | ||
|
ee9e070d75 | ||
|
a769fe0a58 | ||
|
dbf41eb0b0 | ||
|
|
f086a341da | ||
|
9714319110 | ||
|
df302e6748 | ||
|
558f5c6315 | ||
|
|
f0fdf7c568 | ||
|
|
302f5ad386 | ||
|
|
e891c467f0 | ||
|
|
6105897461 | ||
|
d003cb2a7d | ||
|
|
f8593bceab | ||
|
|
6eab7f1b6a | ||
|
|
2264e6daa9 | ||
|
|
24e3e25f16 | ||
|
|
a4495045d0 | ||
|
17bed3db91 | ||
|
f4ee7648ad | ||
|
3992f9ca91 | ||
|
|
34a505db5c | ||
|
|
dc22ec46cb | ||
|
|
dec45f8d97 | ||
|
|
80d15bf8ba | ||
|
|
1ef06b2533 | ||
|
|
71fb82b5bc | ||
|
|
11a93ac029 | ||
|
|
4407d70045 | ||
|
|
ab8bfa2903 | ||
|
|
37bbc185a5 | ||
|
|
125b994038 | ||
|
|
d9a3ca9946 | ||
|
|
1016065d6b | ||
|
8c2a31f378 | ||
|
|
e1206f4b9b | ||
|
|
7f13b20e33 | ||
|
|
6226c24d43 | ||
|
|
b4d8fed0e8 | ||
|
|
de041f9852 | ||
|
|
7b9bef18d0 | ||
|
|
802b718d0d | ||
|
|
c4326802f6 | ||
|
|
fb5d41231c | ||
|
|
3d38aa7715 | ||
|
5b062b29c6 | ||
|
|
55890d6209 | ||
|
|
533fa0ccda | ||
|
|
c53c695e25 | ||
|
|
23af1c94df | ||
|
|
3ddd549ff7 | ||
|
|
92cbaff664 | ||
|
|
ef88d6ddbd | ||
|
|
8c971991de | ||
|
103d925e9b | ||
|
|
410101bd76 | ||
|
|
179a268857 | ||
|
|
ccc8847b19 | ||
|
|
eead7177ab | ||
|
|
b9fcda35df | ||
|
|
f4e8f1bb0a | ||
|
|
9199268aed | ||
|
|
26768920ec | ||
|
|
c254d4e73e | ||
|
|
17862cd969 | ||
|
|
454fed4a4c | ||
|
|
6da9e16e53 | ||
|
|
e8de8a9ce3 | ||
|
|
5d3551ec4c | ||
|
|
777c11480e |
@ -4,5 +4,5 @@
|
||||
<%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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'\n%end\n"
|
||||
|
||||
|
||||
@ -25,8 +25,9 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
|
||||
@dial-up
|
||||
|
||||
kernel
|
||||
|
||||
dracut-config-generic
|
||||
# install tools needed to manage and boot arm systems
|
||||
@arm-tools
|
||||
|
||||
chrony
|
||||
extlinux-bootloader
|
||||
@ -38,8 +39,6 @@ initial-setup-gui
|
||||
# remove this in %post
|
||||
dracut-config-generic
|
||||
|
||||
# install uboot images
|
||||
uboot-images-armv7
|
||||
|
||||
# make sure all the locales are available for inital0-setup and anaconda to work
|
||||
glibc-all-langpacks
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
%include fedora-arm-xbase.ks
|
||||
%include fedora-kde-packages.ks
|
||||
|
||||
part / --size=5000 --fstype ext4
|
||||
part / --size=5632 --fstype ext4
|
||||
|
||||
%post
|
||||
echo -n "Enabling initial-setup gui mode on startup"
|
||||
|
||||
@ -11,6 +11,8 @@ part / --size=1279 --fstype ext4
|
||||
-generic-release*
|
||||
-glibc-all-langpacks
|
||||
glibc-langpack-en
|
||||
iw
|
||||
NetworkManager-wifi
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Like the Atomic cloud image, but tuned for vagrant. Enable
|
||||
# the vagrant user, disable cloud-init.
|
||||
|
||||
%include fedora-cloud-atomic.ks
|
||||
%include fedora-atomic.ks
|
||||
|
||||
services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
@ -33,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=https://kojipkgs.fedoraproject.org/atomic/24/ --ref=fedora-atomic/24/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 'https://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/24/'
|
||||
|
||||
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
||||
@ -18,8 +18,12 @@ hexchat
|
||||
transmission
|
||||
parole
|
||||
|
||||
# unlock default keyring. FIXME: Should probably be done in comps
|
||||
gnome-keyring-pam
|
||||
# make sure we have a graphical installer
|
||||
yumex-dnf
|
||||
|
||||
# extra backgrounds
|
||||
desktop-backgrounds-basic
|
||||
f24-backgrounds-extras-gnome
|
||||
|
||||
# save some space
|
||||
-fedora-icon-theme
|
||||
|
||||
12
fedora-cloud-base-arm.ks
Normal file
12
fedora-cloud-base-arm.ks
Normal file
@ -0,0 +1,12 @@
|
||||
%include fedora-cloud-base.ks
|
||||
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
|
||||
|
||||
part /boot --fstype="ext4" --size=500
|
||||
part /boot/efi --fstype="vfat" --size=100
|
||||
|
||||
%packages
|
||||
efibootmgr
|
||||
grub2-efi
|
||||
shim
|
||||
%end
|
||||
10
fedora-cloud-base-ppc.ks
Normal file
10
fedora-cloud-base-ppc.ks
Normal file
@ -0,0 +1,10 @@
|
||||
%include fedora-cloud-base.ks
|
||||
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
|
||||
part prepboot --fstype="prepboot" --size=4
|
||||
part /boot --fstype="ext4" --size=500
|
||||
|
||||
%packages
|
||||
grub2
|
||||
%end
|
||||
@ -19,7 +19,7 @@ rootpw vagrant
|
||||
# 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"
|
||||
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
|
||||
|
||||
@ -43,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
part / --size 3000 --fstype ext4 --grow
|
||||
part / --fstype ext4 --grow
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
||||
@ -61,6 +61,11 @@ reboot
|
||||
|
||||
kernel-core
|
||||
@^cloud-server-environment
|
||||
# Need to pull in the udev subpackage
|
||||
systemd-udev
|
||||
|
||||
# after move away from grub2 - let's add 'which' back
|
||||
which
|
||||
|
||||
# rescue mode generally isn't useful in the cloud context
|
||||
-dracut-config-rescue
|
||||
|
||||
6
fedora-docker-base-arm.ks
Normal file
6
fedora-docker-base-arm.ks
Normal file
@ -0,0 +1,6 @@
|
||||
%include fedora-docker-base.ks
|
||||
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
|
||||
part /boot --fstype="ext4" --size=500
|
||||
part /boot/efi --fstype="vfat" --size=100
|
||||
5
fedora-docker-base-ppc.ks
Normal file
5
fedora-docker-base-ppc.ks
Normal file
@ -0,0 +1,5 @@
|
||||
%include fedora-docker-base.ks
|
||||
|
||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
|
||||
part prepboot --fstype="prepboot" --size=4
|
||||
@ -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
|
||||
#
|
||||
|
||||
@ -24,12 +24,13 @@ user --name=none
|
||||
keyboard us
|
||||
zerombr
|
||||
clearpart --all
|
||||
part / --size 3000 --fstype ext4
|
||||
part / --fstype ext4 --grow
|
||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||
reboot
|
||||
|
||||
%packages --excludedocs --instLangs=en --nocore
|
||||
bash
|
||||
tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
|
||||
fedora-release
|
||||
rootfiles
|
||||
vim-minimal
|
||||
@ -76,13 +77,13 @@ localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
|
||||
rm -rf /var/cache/yum/*
|
||||
rm -f /tmp/ks-script*
|
||||
|
||||
#Make it easier for systemd to run in Docker container
|
||||
cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
|
||||
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
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
%packages
|
||||
@firefox
|
||||
@kde-apps
|
||||
@kde-desktop
|
||||
@kde-media
|
||||
@ -9,7 +10,7 @@
|
||||
### The KDE-Desktop
|
||||
|
||||
### Browser
|
||||
firefox
|
||||
qupzilla
|
||||
|
||||
### fixes
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
%include fedora-live-kde.ks
|
||||
|
||||
# The recommended part size for DVDs is too close to use for the astronomy spin
|
||||
part / --size 12288
|
||||
part / --size 14500
|
||||
|
||||
%packages
|
||||
|
||||
@ -44,43 +44,16 @@ indi-gphoto
|
||||
indi-sx
|
||||
indistarter
|
||||
kstars
|
||||
skychart
|
||||
skychart-data-dso
|
||||
skychart-data-stars
|
||||
stellarium
|
||||
|
||||
# misc. astronomy
|
||||
celestia
|
||||
xvarstar
|
||||
virtualplanet
|
||||
|
||||
# Some astro environment stuff
|
||||
astronomy-bookmarks
|
||||
astronomy-menus
|
||||
astronomy-menus-toplevel
|
||||
|
||||
#python 2 tools/libraries not included from the groups
|
||||
python-tools
|
||||
python-ipython
|
||||
python-ipython-console
|
||||
python-ipython-notebook
|
||||
sympy
|
||||
python-networkx
|
||||
python-pandas
|
||||
# Python astronomy
|
||||
astropy-tools
|
||||
python-astropy
|
||||
python-astroML
|
||||
python-astroML-addons
|
||||
python2-astroquery
|
||||
python2-ccdproc
|
||||
python2-gatspy
|
||||
python-photutils
|
||||
python-sep
|
||||
pyephem
|
||||
APLpy
|
||||
ATpy
|
||||
|
||||
|
||||
#python 3 and tools/libraries not included from the groups
|
||||
python3
|
||||
python3-tools
|
||||
@ -106,9 +79,6 @@ python3-photutils
|
||||
python3-sep
|
||||
|
||||
# matplotlib backends
|
||||
python-matplotlib-qt4
|
||||
python-matplotlib-qt5
|
||||
python-matplotlib-tk
|
||||
python3-matplotlib-qt4
|
||||
python3-matplotlib-qt5
|
||||
python3-matplotlib-tk
|
||||
@ -116,8 +86,6 @@ python3-matplotlib-tk
|
||||
|
||||
# Python IDE very useful for scientific use
|
||||
python3-spyder
|
||||
spyder
|
||||
|
||||
|
||||
#Version control- a GUI for each as well
|
||||
|
||||
@ -125,18 +93,13 @@ spyder
|
||||
rapidsvn
|
||||
git
|
||||
git-gui
|
||||
# Mercurial
|
||||
mercurial
|
||||
mercurial-hgk
|
||||
|
||||
#Drawing, Picture viewing tools, Visualization tools
|
||||
dia
|
||||
gimp
|
||||
inkscape
|
||||
# Disabled temp. due to dependency issue with gsl 2.1
|
||||
#kst
|
||||
#kst-docs
|
||||
#kst-fits
|
||||
kst
|
||||
kst-docs
|
||||
kst-fits
|
||||
LabPlot
|
||||
|
||||
#Misc. Utils
|
||||
@ -147,6 +110,7 @@ kate
|
||||
kate-plugins
|
||||
rlwrap
|
||||
screen
|
||||
plasma-applet-redshift-control
|
||||
|
||||
# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
|
||||
-kde-l10n-*
|
||||
|
||||
@ -55,8 +55,6 @@ aajohan-comfortaa-fonts
|
||||
|
||||
# Without this, initramfs generation during live image creation fails: #1242586
|
||||
dracut-live
|
||||
dracut-config-generic
|
||||
-dracut-config-rescue
|
||||
grub2-efi
|
||||
syslinux
|
||||
|
||||
@ -74,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
|
||||
@ -319,6 +317,10 @@ rm -f /var/lib/systemd/random-seed
|
||||
echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
||||
| tee /etc/.updated >/var/.updated
|
||||
|
||||
# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
|
||||
# See bug 1317709
|
||||
rm -f /boot/*-rescue*
|
||||
|
||||
%end
|
||||
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
%include fedora-live-workstation.ks
|
||||
|
||||
# Size partition
|
||||
part / --size 10240
|
||||
part / --size 14336
|
||||
|
||||
%packages
|
||||
# Switch to groups for design suite
|
||||
@ -19,13 +19,17 @@ part / --size 10240
|
||||
# Preview Gnome Photos
|
||||
gnome-photos
|
||||
|
||||
# Add gthumb for renaming group files
|
||||
gthumb
|
||||
|
||||
# Extra wallpapers
|
||||
f23-backgrounds-extras-base
|
||||
f23-backgrounds-extras-gnome
|
||||
f24-backgrounds-extras-base
|
||||
f24-backgrounds-extras-gnome
|
||||
|
||||
# removal of unneeded applications
|
||||
-gnome-boxes
|
||||
-gthumb
|
||||
-eog
|
||||
-rdesktop
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ extremetuxracer
|
||||
freeciv
|
||||
freecol
|
||||
freedoom
|
||||
freedroidrpg
|
||||
# freedroidrpg cut for size
|
||||
frozen-bubble
|
||||
gl-117
|
||||
glob2
|
||||
@ -66,7 +66,7 @@ ultimatestunts
|
||||
warzone2100
|
||||
wesnoth
|
||||
# worminator # Would pull in fluid-soundfont-lite-patches
|
||||
warmux
|
||||
# warmux - Cut for size
|
||||
xmoto
|
||||
|
||||
# traditional (small)
|
||||
@ -98,7 +98,7 @@ openlierox
|
||||
pachi
|
||||
pioneers
|
||||
quarry
|
||||
Ri-li
|
||||
# Ri-li cut for size
|
||||
rogue
|
||||
# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
|
||||
seahorse-adventures
|
||||
|
||||
@ -30,7 +30,7 @@ mkdir -p /home/liveuser/.config/xfce4
|
||||
cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
|
||||
MailReader=sylpheed-claws
|
||||
FileManager=Thunar
|
||||
WebBrowser=midori
|
||||
WebBrowser=firefox
|
||||
FOE
|
||||
|
||||
# disable screensaver locking (#674410)
|
||||
|
||||
@ -7,27 +7,25 @@ compiz-plugins-main
|
||||
compiz-plugins-extra
|
||||
compiz-manager
|
||||
compizconfig-python
|
||||
compiz-plugins-unsupported
|
||||
compiz-mate
|
||||
compiz-plugins-experimental
|
||||
libcompizconfig
|
||||
compiz-plugins-main
|
||||
ccsm
|
||||
simple-ccsm
|
||||
emerald-themes
|
||||
emerald
|
||||
fusion-icon
|
||||
fusion-icon-gtk
|
||||
@networkmanager-submodules
|
||||
blueman
|
||||
|
||||
# some apps from mate-applications
|
||||
caja-actions
|
||||
mate-disk-usage-analyzer
|
||||
mate-netspeed
|
||||
|
||||
# more backgrounds
|
||||
f23-backgrounds-base
|
||||
f23-backgrounds-mate
|
||||
f23-backgrounds-extras-base
|
||||
f24-backgrounds-base
|
||||
f24-backgrounds-mate
|
||||
f24-backgrounds-extras-base
|
||||
|
||||
# system tools
|
||||
system-config-printer
|
||||
@ -48,6 +46,10 @@ PackageKit-gstreamer-plugin
|
||||
# dsl tools
|
||||
rp-pppoe
|
||||
|
||||
# some tools
|
||||
p7zip
|
||||
p7zip-plugins
|
||||
|
||||
# FIXME; apparently the glibc maintainers dislike this, but it got put into the
|
||||
# desktop image at some point. We won't touch this one for now.
|
||||
nss-mdns
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
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
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
|
||||
|
||||
@ -1 +1,2 @@
|
||||
repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
|
||||
url --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
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
-abrt-cli
|
||||
-ibus*
|
||||
-hyperv-daemons
|
||||
-webkitgtk4-plugin-process-gtk2
|
||||
|
||||
# Add some extra fonts
|
||||
dejavu-sans-fonts
|
||||
@ -76,9 +77,6 @@ pulseaudio-utils
|
||||
# Usefulness for DSL connections as per:
|
||||
# http://bugs.sugarlabs.org/ticket/1951
|
||||
rp-pppoe
|
||||
# Useful for SoaS duplication from:
|
||||
# http://bugs.sugarlabs.org/ticket/74
|
||||
livecd-tools
|
||||
|
||||
# Get the Sugar boot screen
|
||||
-plymouth-system-theme
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
@core
|
||||
@firefox
|
||||
@fonts
|
||||
@gnome-desktop
|
||||
@guest-desktop-agents
|
||||
@hardware-support
|
||||
@libreoffice
|
||||
|
||||
@ -21,6 +21,8 @@
|
||||
|
||||
# unlock default keyring. FIXME: Should probably be done in comps
|
||||
gnome-keyring-pam
|
||||
# Admin tools are handy to have
|
||||
@admin-tools
|
||||
# Add some screensavers, people seem to like them
|
||||
# Note that blank is still default.
|
||||
xscreensaver-extras
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
%post --nochroot
|
||||
# Copy over files needed for networking inside the chroot
|
||||
for f in /etc/resolv.conf /etc/hosts ; do
|
||||
test -f $f && cp -a $f ${INSTALL_ROOT}${f}.kickstart
|
||||
test -f $f && cp $f /mnt/sysimage/$f.kickstart
|
||||
done
|
||||
%end
|
||||
|
||||
@ -19,7 +19,7 @@ PK_PREFIX=`mktemp -d`
|
||||
mkdir -p $PK_PREFIX/etc/yum.repos.d
|
||||
if [ -f /etc/yum.repos.d/fedora.repo ] ; then
|
||||
cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
|
||||
sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/branched/$basearch/os/|' \
|
||||
sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
|
||||
$PK_PREFIX/etc/yum.repos.d/fedora.repo
|
||||
fi
|
||||
if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
|
||||
@ -34,7 +34,7 @@ if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
|
||||
fi
|
||||
if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
|
||||
cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
|
||||
sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/$basearch/os/|' \
|
||||
sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
|
||||
$PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
|
||||
fi
|
||||
rpm --root=$PK_PREFIX --initdb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user