mirror of
https://pagure.io/fedora-kickstarts.git
synced 2025-12-09 16:40:30 +08:00
Compare commits
55 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b3343d28d | ||
|
|
add7504fce | ||
|
|
dff74da0db | ||
|
|
45f095ea8c | ||
|
|
db62fb95bb | ||
|
|
d69335cb69 | ||
|
|
ee22a9c00c | ||
|
|
0b4dd5958b | ||
|
|
da8521bafa | ||
|
|
b773ad0ff9 | ||
|
|
fa2c69cad8 | ||
|
|
098f03f685 | ||
|
|
a6d3b1c456 | ||
|
|
d293e561f4 | ||
|
|
2459d8254b | ||
|
|
6817b9661f | ||
|
|
9fe671fe49 | ||
|
|
a355ff602c | ||
|
|
16d3e54ff7 | ||
|
|
9d0ef8b63c | ||
|
|
c5098636e8 | ||
|
|
ba2ab327a1 | ||
|
|
d62f2f1688 | ||
|
|
524149a63e | ||
|
|
077aacb29d | ||
|
|
7b8922bfca | ||
|
|
4dd1659d02 | ||
|
|
b899a6e8ef | ||
|
|
58fd2bb1b3 | ||
|
|
3dc4603931 | ||
|
|
93c87e947c | ||
|
|
22c37e61ca | ||
|
|
78114bb82f | ||
|
|
b44bc5a578 | ||
|
|
ca778f7bc6 | ||
|
|
29181aa376 | ||
|
|
97fbfec937 | ||
|
|
aca277c870 | ||
|
|
0ecfd28e29 | ||
|
|
a17b0e0933 | ||
|
|
6ea47a9570 | ||
|
|
f2c71083fe | ||
|
|
3543c6c06a | ||
|
|
16ee97ef54 | ||
|
|
8d322093ec | ||
|
|
54dd9b2395 | ||
|
|
987c20e3b4 | ||
|
|
cbf8ff5eb6 | ||
|
|
aeb995e9ad | ||
|
|
dc042df773 | ||
|
|
27454a96cd | ||
|
|
becb8f7b89 | ||
|
|
ddfcfc68fa | ||
|
|
3d0080cf04 | ||
|
|
d39c5a37b9 |
2
Makefile
2
Makefile
@@ -18,6 +18,8 @@ install:
|
|||||||
install -m 644 custom/* $(DATADIR)/$(name)/custom
|
install -m 644 custom/* $(DATADIR)/$(name)/custom
|
||||||
mkdir -p -m 755 $(DATADIR)/$(name)/l10n
|
mkdir -p -m 755 $(DATADIR)/$(name)/l10n
|
||||||
install -m 644 l10n/* $(DATADIR)/$(name)/l10n
|
install -m 644 l10n/* $(DATADIR)/$(name)/l10n
|
||||||
|
mkdir -p -m 755 $(DATADIR)/$(name)/snippets
|
||||||
|
install -m 644 snippets/* $(DATADIR)/$(name)/snippets
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(name)-*.tar.gz
|
rm -f $(name)-*.tar.gz
|
||||||
|
|||||||
@@ -4,5 +4,5 @@
|
|||||||
<%page args="ostree_osname, ostree_ref"/>
|
<%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 "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 "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/23/'\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/22/'\n%end\n"
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ shutdown
|
|||||||
services --disabled=docker-storage-setup,network
|
services --disabled=docker-storage-setup,network
|
||||||
services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
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/23/ --ref=fedora-atomic/f23/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
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
|
||||||
|
|||||||
@@ -33,14 +33,14 @@ volgroup atomicos pv.01
|
|||||||
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
|
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
|
||||||
|
|
||||||
# Equivalent of %include fedora-repo.ks
|
# Equivalent of %include fedora-repo.ks
|
||||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
|
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
|
||||||
|
|
||||||
reboot
|
reboot
|
||||||
|
|
||||||
%post --erroronfail
|
%post --erroronfail
|
||||||
# See https://github.com/projectatomic/rpm-ostree/issues/42
|
# See https://github.com/projectatomic/rpm-ostree/issues/42
|
||||||
ostree remote delete fedora-atomic
|
ostree remote delete fedora-atomic
|
||||||
ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'
|
ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
|
||||||
|
|
||||||
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ user --name=none
|
|||||||
|
|
||||||
firewall --disabled
|
firewall --disabled
|
||||||
|
|
||||||
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
|
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
|
||||||
|
|
||||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||||
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||||
@@ -77,6 +77,7 @@ kernel-core
|
|||||||
#-kbd
|
#-kbd
|
||||||
-uboot-tools
|
-uboot-tools
|
||||||
-kernel
|
-kernel
|
||||||
|
-grub2
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|
||||||
@@ -113,6 +114,9 @@ passwd -l root
|
|||||||
# remove the user anaconda forces us to make
|
# remove the user anaconda forces us to make
|
||||||
userdel -r none
|
userdel -r none
|
||||||
|
|
||||||
|
# Kickstart specifies timeout in seconds; syslinux uses 10ths.
|
||||||
|
# 0 means wait forever, so instead we'll go with 1.
|
||||||
|
sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
|
||||||
|
|
||||||
# setup systemd to boot to the right runlevel
|
# setup systemd to boot to the right runlevel
|
||||||
echo -n "Setting default runlevel to multiuser text mode"
|
echo -n "Setting default runlevel to multiuser text mode"
|
||||||
@@ -231,12 +235,21 @@ echo "-----------------------------------------------------------------------"
|
|||||||
rm -f /var/lib/rpm/__db*
|
rm -f /var/lib/rpm/__db*
|
||||||
|
|
||||||
|
|
||||||
|
# This is a temporary workaround for
|
||||||
|
# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
|
||||||
|
# where sfdisk seems to be messing up the mbr.
|
||||||
|
# Long-term fix is to address this in anaconda directly and remove this.
|
||||||
|
# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
|
||||||
|
dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
|
||||||
|
|
||||||
|
|
||||||
# FIXME: is this still needed?
|
# FIXME: is this still needed?
|
||||||
echo "Fixing SELinux contexts."
|
echo "Fixing SELinux contexts."
|
||||||
touch /var/log/cron
|
touch /var/log/cron
|
||||||
touch /var/log/boot.log
|
touch /var/log/boot.log
|
||||||
|
chattr -i /boot/extlinux/ldlinux.sys
|
||||||
/usr/sbin/fixfiles -R -a restore
|
/usr/sbin/fixfiles -R -a restore
|
||||||
|
chattr +i /boot/extlinux/ldlinux.sys
|
||||||
|
|
||||||
echo "Zeroing out empty space."
|
echo "Zeroing out empty space."
|
||||||
# This forces the filesystem to reclaim space from deleted files
|
# This forces the filesystem to reclaim space from deleted files
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ rootfiles
|
|||||||
vim-minimal
|
vim-minimal
|
||||||
dnf
|
dnf
|
||||||
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
|
dnf-yum # https://fedorahosted.org/fesco/ticket/1312#comment:29
|
||||||
|
sssd-client
|
||||||
#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
|
#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
|
||||||
-kernel
|
-kernel
|
||||||
|
|
||||||
@@ -51,10 +52,17 @@ userdel -r none
|
|||||||
LANG="en_US"
|
LANG="en_US"
|
||||||
echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
|
echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
|
||||||
|
|
||||||
|
# Carry these configs for both dnf and yum for users who are calling
|
||||||
|
# yum-deprecated directly. This will keep the experience between both
|
||||||
|
# consistent
|
||||||
awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
|
awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
|
||||||
< /etc/yum.conf > /etc/yum.conf.new
|
< /etc/yum.conf > /etc/yum.conf.new
|
||||||
mv /etc/yum.conf.new /etc/yum.conf
|
mv /etc/yum.conf.new /etc/yum.conf
|
||||||
|
|
||||||
|
awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
|
||||||
|
< /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
|
||||||
|
mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
|
||||||
|
|
||||||
echo "Import RPM GPG key"
|
echo "Import RPM GPG key"
|
||||||
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
releasever=$(rpm -q --qf '%{version}\n' fedora-release)
|
||||||
basearch=$(uname -i)
|
basearch=$(uname -i)
|
||||||
|
|||||||
@@ -16,12 +16,12 @@
|
|||||||
# use the source repo, we can't just include fedora-repo.ks
|
# use the source repo, we can't just include fedora-repo.ks
|
||||||
|
|
||||||
# In the master branch the rawhide repo commands should be uncommented.
|
# 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 --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-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
|
# 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 --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-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.
|
# Package manifest for the compose. Uses repo group metadata to translate groups.
|
||||||
# (default groups for the configured repos are added by --default)
|
# (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
|
# use the source repo, we can't just include fedora-repo.ks
|
||||||
|
|
||||||
# In the master branch the rawhide repo commands should be uncommented.
|
# 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 --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-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
|
# 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 --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-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.
|
# Package manifest for the compose. Uses repo group metadata to translate groups.
|
||||||
# (default groups for the configured repos are added by --default)
|
# (default groups for the configured repos are added by --default)
|
||||||
@@ -92,6 +92,7 @@ dracut-*
|
|||||||
# Web Server environment
|
# Web Server environment
|
||||||
@haproxy
|
@haproxy
|
||||||
@mongodb
|
@mongodb
|
||||||
|
@perl-web
|
||||||
@python-web
|
@python-web
|
||||||
@php
|
@php
|
||||||
@rubyonrails
|
@rubyonrails
|
||||||
|
|||||||
@@ -16,12 +16,12 @@
|
|||||||
# use the source repo, we can't just include fedora-repo.ks
|
# use the source repo, we can't just include fedora-repo.ks
|
||||||
|
|
||||||
# In the master branch the rawhide repo commands should be uncommented.
|
# 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 --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-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
|
# 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 --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-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
|
%include fedora-workstation-packages.ks
|
||||||
|
|
||||||
|
|||||||
@@ -313,12 +313,6 @@ rm -f /core*
|
|||||||
# convince readahead not to collect
|
# convince readahead not to collect
|
||||||
# FIXME: for systemd
|
# FIXME: for systemd
|
||||||
|
|
||||||
# forcibly regenerate fontconfig cache (so long as this live image has
|
|
||||||
# fontconfig) - see #1169979
|
|
||||||
if [ -x /usr/bin/fc-cache ] ; then
|
|
||||||
fc-cache -f
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
||||||
| tee /etc/.updated >/var/.updated
|
| tee /etc/.updated >/var/.updated
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
# https://fedoraproject.org/wiki/User:jvlomax
|
# https://fedoraproject.org/wiki/User:jvlomax
|
||||||
# Brendan Jones <brendan.jones.it@gmail.com>
|
# Brendan Jones <brendan.jones.it@gmail.com>
|
||||||
|
|
||||||
%include fedora-livecd-kde.ks
|
%include fedora-live-kde.ks
|
||||||
|
|
||||||
# DVD size partition
|
# DVD size partition
|
||||||
part / --size 10240 --fstype ext4
|
part / --size 10240 --fstype ext4
|
||||||
@@ -77,7 +77,7 @@ sooperlooper
|
|||||||
|
|
||||||
#recodring and DAW
|
#recodring and DAW
|
||||||
audacity
|
audacity
|
||||||
ardour3
|
ardour4
|
||||||
rosegarden4
|
rosegarden4
|
||||||
seq24
|
seq24
|
||||||
muse
|
muse
|
||||||
|
|||||||
@@ -79,7 +79,4 @@ chown -R liveuser:liveuser /home/liveuser/
|
|||||||
restorecon -R /home/liveuser/
|
restorecon -R /home/liveuser/
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# This is a huge file and things work ok without it
|
|
||||||
rm -f /usr/share/icons/HighContrast/icon-theme.cache
|
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|||||||
@@ -21,9 +21,9 @@ part / --size 12288
|
|||||||
@engineering-and-scientific
|
@engineering-and-scientific
|
||||||
|
|
||||||
# scilab
|
# scilab
|
||||||
#scilab
|
scilab
|
||||||
#scilab-devel
|
scilab-devel
|
||||||
#scilab-doc
|
scilab-doc
|
||||||
|
|
||||||
# sagemath
|
# sagemath
|
||||||
# BZ #1006230 should fix this
|
# BZ #1006230 should fix this
|
||||||
|
|||||||
@@ -94,9 +94,6 @@ gnome-keyring-pam
|
|||||||
%post
|
%post
|
||||||
# xfce configuration
|
# xfce configuration
|
||||||
|
|
||||||
# This is a huge file and things work ok without it
|
|
||||||
rm -f /usr/share/icons/HighContrast/icon-theme.cache
|
|
||||||
|
|
||||||
# create /etc/sysconfig/desktop (needed for installation)
|
# create /etc/sysconfig/desktop (needed for installation)
|
||||||
|
|
||||||
cat > /etc/sysconfig/desktop <<EOF
|
cat > /etc/sysconfig/desktop <<EOF
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ org.laptop.StopWatchActivity
|
|||||||
org.laptop.community.Finance
|
org.laptop.community.Finance
|
||||||
org.laptop.community.TypingTurtle
|
org.laptop.community.TypingTurtle
|
||||||
org.laptop.sugar.Jukebox
|
org.laptop.sugar.Jukebox
|
||||||
|
org.laptop.Words
|
||||||
org.eq.FotoToon
|
org.eq.FotoToon
|
||||||
org.gnome.Labyrinth
|
org.gnome.Labyrinth
|
||||||
com.laptop.Ruler
|
com.laptop.Ruler
|
||||||
@@ -58,6 +59,7 @@ org.sugarlabs.AbacusActivity
|
|||||||
org.sugarlabs.IRC
|
org.sugarlabs.IRC
|
||||||
org.sugarlabs.InfoSlicer
|
org.sugarlabs.InfoSlicer
|
||||||
org.sugarlabs.PortfolioActivity
|
org.sugarlabs.PortfolioActivity
|
||||||
|
org.sugarlabs.StoryActivity
|
||||||
org.sugarlabs.VisualMatchActivity
|
org.sugarlabs.VisualMatchActivity
|
||||||
com.garycmartin.Moon
|
com.garycmartin.Moon
|
||||||
mulawa.Countries
|
mulawa.Countries
|
||||||
|
|||||||
@@ -10,9 +10,6 @@ part / --size 6144
|
|||||||
|
|
||||||
%post
|
%post
|
||||||
|
|
||||||
# This is a huge file and things work ok without it
|
|
||||||
rm -f /usr/share/icons/HighContrast/icon-theme.cache
|
|
||||||
|
|
||||||
cat >> /etc/rc.d/init.d/livesys << EOF
|
cat >> /etc/rc.d/init.d/livesys << EOF
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,6 @@
|
|||||||
%post
|
%post
|
||||||
# xfce configuration
|
# xfce configuration
|
||||||
|
|
||||||
# This is a huge file and things work ok without it
|
|
||||||
rm -f /usr/share/icons/HighContrast/icon-theme.cache
|
|
||||||
|
|
||||||
# create /etc/sysconfig/desktop (needed for installation)
|
# create /etc/sysconfig/desktop (needed for installation)
|
||||||
|
|
||||||
cat > /etc/sysconfig/desktop <<EOF
|
cat > /etc/sysconfig/desktop <<EOF
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
%packages
|
%packages
|
||||||
|
-PackageKit* # we switched to yumex, so we don't need this
|
||||||
firefox
|
firefox
|
||||||
@mate
|
@mate
|
||||||
compiz
|
compiz
|
||||||
@@ -19,7 +20,7 @@ fusion-icon-gtk
|
|||||||
blueman
|
blueman
|
||||||
|
|
||||||
# some apps from mate-applications
|
# some apps from mate-applications
|
||||||
# caja-actions
|
caja-actions
|
||||||
mate-disk-usage-analyzer
|
mate-disk-usage-analyzer
|
||||||
mate-netspeed
|
mate-netspeed
|
||||||
|
|
||||||
@@ -38,18 +39,15 @@ parole
|
|||||||
exaile
|
exaile
|
||||||
PackageKit-gstreamer-plugin
|
PackageKit-gstreamer-plugin
|
||||||
|
|
||||||
|
# blacklist applications which breaks mate-desktop
|
||||||
|
-audacious
|
||||||
|
|
||||||
# office
|
# office
|
||||||
@libreoffice
|
@libreoffice
|
||||||
|
|
||||||
# dsl tools
|
# dsl tools
|
||||||
rp-pppoe
|
rp-pppoe
|
||||||
|
|
||||||
# drop packages
|
|
||||||
-PackageKit* # we switched to yumex, so we don't need this
|
|
||||||
|
|
||||||
# blacklist applications which breaks mate-desktop
|
|
||||||
-audacious
|
|
||||||
|
|
||||||
# FIXME; apparently the glibc maintainers dislike this, but it got put into the
|
# 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.
|
# desktop image at some point. We won't touch this one for now.
|
||||||
nss-mdns
|
nss-mdns
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# Exactly one of the following should be uncommented
|
# Exactly one of the following should be uncommented
|
||||||
|
|
||||||
# For the master branch 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
|
# For non-master branches the following should be uncommented
|
||||||
%include fedora-repo-not-rawhide.ks
|
# %include fedora-repo-not-rawhide.ks
|
||||||
|
|||||||
@@ -25,6 +25,10 @@ gnome-keyring-pam
|
|||||||
# Note that blank is still default.
|
# Note that blank is still default.
|
||||||
xscreensaver-extras
|
xscreensaver-extras
|
||||||
wget
|
wget
|
||||||
|
# Handy for debugging
|
||||||
|
rfkill
|
||||||
|
# Better more popular browser
|
||||||
|
firefox
|
||||||
system-config-printer
|
system-config-printer
|
||||||
|
|
||||||
# save some space
|
# save some space
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
# %post modifications for gdm
|
|
||||||
|
|
||||||
cat >> /etc/rc.d/init.d/fedora-live << EOF
|
|
||||||
chown -R fedora:fedora /home/fedora
|
|
||||||
sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
|
|
||||||
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
|
|
||||||
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
|
|
||||||
chown fedora:fedora /home/fedora/.face
|
|
||||||
# TODO: would be nice to get e-d-s to pick this one up too... but how?
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
# %post modifications for kdm and kde
|
|
||||||
|
|
||||||
# add initscript
|
|
||||||
cat >> /etc/rc.d/init.d/fedora-live << EOF
|
|
||||||
|
|
||||||
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
|
|
||||||
# use image also for kdm
|
|
||||||
mkdir -p /usr/share/apps/kdm/faces
|
|
||||||
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
|
|
||||||
fi
|
|
||||||
|
|
||||||
# make fedora user use KDE
|
|
||||||
echo "startkde" > /home/fedora/.xsession
|
|
||||||
chmod a+x /home/fedora/.xsession
|
|
||||||
chown fedora:fedora /home/fedora/.xsession
|
|
||||||
|
|
||||||
# set up autologin for user fedora
|
|
||||||
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
|
|
||||||
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
|
|
||||||
|
|
||||||
# set up user fedora as default user and preselected user
|
|
||||||
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
|
|
||||||
sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
|
|
||||||
|
|
||||||
# add liveinst.desktop to favorites menu
|
|
||||||
mkdir -p /home/fedora/.kde/share/config/
|
|
||||||
cat > /home/fedora/.kde/share/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
|
|
||||||
MENU_EOF
|
|
||||||
chown -R fedora:fedora /home/fedora/.kde/
|
|
||||||
EOF
|
|
||||||
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
# %post modifications to add link to demonstration videos to desktop
|
|
||||||
|
|
||||||
cat >> /etc/rc.d/init.d/fedora-live << EOF
|
|
||||||
pushd /home/fedora/Desktop
|
|
||||||
ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
|
|
||||||
popd
|
|
||||||
EOF
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
# %post modifications specifically for Fedora Electronic Lab
|
|
||||||
|
|
||||||
# Fedora Electronic Lab: Kwin buttons
|
|
||||||
cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
|
|
||||||
[Style]
|
|
||||||
ButtonsOnLeft=MB
|
|
||||||
ButtonsOnRight=FIAX
|
|
||||||
CustomButtonPositions=true
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# kill klipper
|
|
||||||
cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
|
|
||||||
[General]
|
|
||||||
AutoStart=false
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
|
|
||||||
cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
|
|
||||||
[Digital]
|
|
||||||
LCD_Style=false
|
|
||||||
Show_Date=false
|
|
||||||
Show_Seconds=true
|
|
||||||
|
|
||||||
[General]
|
|
||||||
Type=Digital
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
|
|
||||||
[Layout]
|
|
||||||
DisplayNames=
|
|
||||||
EnableXkbOptions=false
|
|
||||||
IncludeGroups=
|
|
||||||
LayoutList=us,de,fr,jp
|
|
||||||
Model=pc104
|
|
||||||
Options=
|
|
||||||
ResetOldOptions=false
|
|
||||||
ShowFlag=true
|
|
||||||
ShowSingle=true
|
|
||||||
StickySwitching=false
|
|
||||||
StickySwitchingDepth=2
|
|
||||||
SwitchMode=Global
|
|
||||||
Use=true
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
|
|
||||||
# This is a feature for Fedora and not for KDE
|
|
||||||
cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
|
|
||||||
cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
|
|
||||||
cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
|
|
||||||
cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
|
|
||||||
|
|
||||||
/sbin/chkconfig anacron off
|
|
||||||
/sbin/chkconfig sendmail off
|
|
||||||
/sbin/chkconfig nfs off
|
|
||||||
/sbin/chkconfig nfslock off
|
|
||||||
/sbin/chkconfig rpcidmapd off
|
|
||||||
/sbin/chkconfig rpcbind off
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
# %post modifications to set up gnome-keyring in KDE
|
|
||||||
|
|
||||||
mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
|
|
||||||
cat > /etc/skel/.kde/env/start-custom.sh << EOF
|
|
||||||
#!/bin/sh
|
|
||||||
eval \`gnome-keyring-daemon\`
|
|
||||||
export GNOME_KEYRING_PID
|
|
||||||
export GNOME_KEYRING_SOCKET
|
|
||||||
EOF
|
|
||||||
chmod 755 /etc/skel/.kde/env/start-custom.sh
|
|
||||||
|
|
||||||
cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
|
|
||||||
#/bin/sh
|
|
||||||
if [-n "$GNOME_KEYRING_PID"]; then
|
|
||||||
kill $GNOME_KEYRING_PID
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# %post modifications to configure tracker search
|
|
||||||
|
|
||||||
mkdir -p /home/fedora/.config/tracker
|
|
||||||
|
|
||||||
cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
|
|
||||||
[Indexing]
|
|
||||||
EnableIndexing=false
|
|
||||||
Language=en
|
|
||||||
EOF
|
|
||||||
|
|
||||||
mkdir -p /root/.config/tracker
|
|
||||||
cat > /root/.config/tracker/tracker.cfg <<EOF
|
|
||||||
[Indexing]
|
|
||||||
EnableIndexing=false
|
|
||||||
Language=en
|
|
||||||
EOF
|
|
||||||
@@ -1,164 +0,0 @@
|
|||||||
###### Eee PC 900 stuff ####################################################
|
|
||||||
#
|
|
||||||
###### Hotkeys #############################################################
|
|
||||||
cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
export DISPLAY=:0
|
|
||||||
|
|
||||||
case "$3" in
|
|
||||||
|
|
||||||
#Fn+F2
|
|
||||||
00000010)
|
|
||||||
# Wlan On
|
|
||||||
/etc/acpi/actions/wlan.sh poweron
|
|
||||||
;;
|
|
||||||
00000011)
|
|
||||||
# Wlan Off
|
|
||||||
/etc/acpi/actions/wlan.sh poweroff
|
|
||||||
;;
|
|
||||||
|
|
||||||
#Fn+F6
|
|
||||||
00000012)
|
|
||||||
# Webcam switch
|
|
||||||
/etc/acpi/actions/camera.sh
|
|
||||||
# TaskManager
|
|
||||||
# /usr/bin/gnome-system-monitor
|
|
||||||
;;
|
|
||||||
|
|
||||||
#Fn+F7
|
|
||||||
00000013)
|
|
||||||
# Volume mute
|
|
||||||
/usr/bin/amixer set -D hw:0 Master toggle
|
|
||||||
;;
|
|
||||||
|
|
||||||
#Fn+F8
|
|
||||||
00000014)
|
|
||||||
# Volume down
|
|
||||||
/usr/bin/amixer set -D hw:0 Master 10%- unmute
|
|
||||||
;;
|
|
||||||
|
|
||||||
#Fn+F9
|
|
||||||
00000015)
|
|
||||||
# Volume up
|
|
||||||
/usr/bin/amixer set -D hw:0 Master 10%+ unmute
|
|
||||||
;;
|
|
||||||
|
|
||||||
#Fn+F5
|
|
||||||
00000030)
|
|
||||||
|
|
||||||
/usr/bin/xrandr --output VGA --mode 1024x768 \
|
|
||||||
--output LVDS --off
|
|
||||||
|
|
||||||
if [[ "$?" != "0" ]]; then
|
|
||||||
|
|
||||||
/usr/bin/xrandr --output VGA --preferred \
|
|
||||||
--output LVDS --off
|
|
||||||
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
00000031)
|
|
||||||
|
|
||||||
/usr/bin/xrandr --output LVDS --mode 800x480 \
|
|
||||||
--output VGA --mode 800x600
|
|
||||||
|
|
||||||
;;
|
|
||||||
|
|
||||||
00000032)
|
|
||||||
|
|
||||||
/usr/bin/xrandr --output VGA --off \
|
|
||||||
--output LVDS --preferred
|
|
||||||
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
logger "ACPI hotkey $3 action is not defined"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
EOHOTKEY
|
|
||||||
|
|
||||||
###### WLAN #############################################################
|
|
||||||
cat > /etc/acpi/actions/wlan.sh << EOF
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
PWR=$(cat /sys/devices/platform/eeepc/wlan)
|
|
||||||
|
|
||||||
UnloadModules() {
|
|
||||||
rmmod ath_pci
|
|
||||||
rmmod ath_rate_sample
|
|
||||||
rmmod wlan_scan_sta
|
|
||||||
rmmod wlan_tkip
|
|
||||||
rmmod wlan_wep
|
|
||||||
rmmod wlan
|
|
||||||
}
|
|
||||||
|
|
||||||
LoadModules() {
|
|
||||||
modprobe ath_pci
|
|
||||||
}
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
poweron)
|
|
||||||
if [[ "$PWR" = "0" ]]; then
|
|
||||||
modprobe pciehp pciehp_force=1
|
|
||||||
|
|
||||||
echo 1 > /sys/devices/platform/eeepc/wlan
|
|
||||||
|
|
||||||
rmmod pciehp
|
|
||||||
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
poweroff)
|
|
||||||
if [[ "$PWR" = "1" ]]; then
|
|
||||||
|
|
||||||
modprobe pciehp pciehp_force=1
|
|
||||||
|
|
||||||
ifconfig ath0 down
|
|
||||||
|
|
||||||
wlanconfig ath0 destroy
|
|
||||||
|
|
||||||
UnloadModules
|
|
||||||
|
|
||||||
echo 0 > /sys/devices/platform/eeepc/wlan
|
|
||||||
|
|
||||||
rmmod pciehp
|
|
||||||
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
EOF
|
|
||||||
|
|
||||||
###### Webcam #############################################################
|
|
||||||
cat > /etc/acpi/actions/camera.sh << EOF
|
|
||||||
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
CAMERA=$(cat /sys/devices/platform/eeepc/camera)
|
|
||||||
|
|
||||||
if [[ "$CAMERA" = "0" ]]; then
|
|
||||||
echo 1 > /sys/devices/platform/eeepc/camera
|
|
||||||
else
|
|
||||||
echo 0 > /sys/devices/platform/eeepc/camera
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod +x "/etc/acpi/actions/*"
|
|
||||||
|
|
||||||
###### Shutdown fix #########################################################
|
|
||||||
echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
|
|
||||||
chmod 755 /sbin/halt.local
|
|
||||||
|
|
||||||
###### Gnome display stuff ##################################################
|
|
||||||
|
|
||||||
gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
|
|
||||||
gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
|
|
||||||
gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
|
|
||||||
gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
|
|
||||||
gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
|
|
||||||
gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
|
|
||||||
gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
|
|
||||||
gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
|
|
||||||
gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
|
|
||||||
gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
|
|
||||||
gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
|
|
||||||
gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
# %post modifications to enable debuginfo repository
|
|
||||||
|
|
||||||
awk '
|
|
||||||
BEGIN {
|
|
||||||
debuginfo = 0
|
|
||||||
}
|
|
||||||
/^\[.*\]/ {
|
|
||||||
if (/debuginfo/) {
|
|
||||||
debuginfo = 1
|
|
||||||
} else {
|
|
||||||
debuginfo = 0
|
|
||||||
}
|
|
||||||
print
|
|
||||||
next
|
|
||||||
}
|
|
||||||
/enabled=0/ && debuginfo {
|
|
||||||
print "enabled=1"
|
|
||||||
next
|
|
||||||
}
|
|
||||||
{
|
|
||||||
print
|
|
||||||
next
|
|
||||||
}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
|
|
||||||
mv /etc/yum.repos.d/fedora.repo{.tmp,}
|
|
||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
# %post modifications to disable GNOME screensaver locking
|
|
||||||
|
|
||||||
cat >> /etc/rc.d/init.d/fedora-live << EOF
|
|
||||||
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
|
|
||||||
EOF
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
# %post modifications to disable KDE screensaver
|
|
||||||
|
|
||||||
sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
# %post modifications to create /etc/sysconfig/desktop for KDE
|
|
||||||
|
|
||||||
cat > /etc/sysconfig/desktop <<EOF
|
|
||||||
DESKTOP="KDE"
|
|
||||||
DISPLAYMANAGER="KDE"
|
|
||||||
EOF
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
# %post modifications to create /etc/sysconfig/desktop for XFCE
|
|
||||||
|
|
||||||
cat > /etc/sysconfig/desktop <<EOF
|
|
||||||
PREFERRED=/usr/bin/startxfce4
|
|
||||||
EOF
|
|
||||||
Reference in New Issue
Block a user