Compare commits
16 Commits
Author | SHA1 | Date |
---|---|---|
Frederick Grose | 4697b2de60 | |
Kevin Fenzi | dfbad4bdf5 | |
Peter Robinson | efe8eb3fc8 | |
Chris Murphy | a69afdb7e0 | |
Adam Williamson | 7611eb3c6e | |
raveit65 | 8d939b753c | |
Christian Dersch | 86b4eec9e5 | |
Miro Hrončok | 24ba25bde9 | |
Miro Hrončok | 3459312f7b | |
Adam Williamson | 5e908f8505 | |
Dennis Gilmore | c2a28fe744 | |
Miro Hrončok | d56802ad50 | |
Jens Petersen | e3d7bfead4 | |
Adam Williamson | 31998a3290 | |
Paul Whalen | 798c350d03 | |
Tomas Hrcka | d05b776460 |
|
@ -18,6 +18,6 @@ parole
|
||||||
rhythmbox
|
rhythmbox
|
||||||
|
|
||||||
# extra backgrounds
|
# extra backgrounds
|
||||||
f35-backgrounds-extras-gnome
|
f36-backgrounds-extras-gnome
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|
|
@ -41,7 +41,7 @@ clearpart --all --initlabel --disklabel=gpt
|
||||||
part prepboot --size=4 --fstype=prepboot
|
part prepboot --size=4 --fstype=prepboot
|
||||||
part biosboot --size=1 --fstype=biosboot
|
part biosboot --size=1 --fstype=biosboot
|
||||||
part /boot/efi --size=100 --fstype=efi
|
part /boot/efi --size=100 --fstype=efi
|
||||||
part /boot --size=500 --fstype=ext4 --label=boot
|
part /boot --size=1000 --fstype=ext4 --label=boot
|
||||||
part btrfs.007 --size=2000 --fstype=btrfs --grow
|
part btrfs.007 --size=2000 --fstype=btrfs --grow
|
||||||
btrfs none --label=fedora btrfs.007
|
btrfs none --label=fedora btrfs.007
|
||||||
btrfs /home --subvol --name=home LABEL=fedora
|
btrfs /home --subvol --name=home LABEL=fedora
|
||||||
|
|
|
@ -93,4 +93,12 @@ touch /etc/machine-id
|
||||||
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
||||||
rm -f /var/lib/rpm/__db*
|
rm -f /var/lib/rpm/__db*
|
||||||
|
|
||||||
|
# Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
|
||||||
|
# when you are using fedora via serial console as you do not get any output post grub
|
||||||
|
# linux does a good job of knowing what consoles need to be enabled.
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2022757
|
||||||
|
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
|
||||||
|
sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
|
||||||
|
fi
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|
|
@ -11,7 +11,7 @@ rootpw --lock --iscrypted locked
|
||||||
bootloader --timeout=1 --append="modprobe.blacklist=vc4"
|
bootloader --timeout=1 --append="modprobe.blacklist=vc4"
|
||||||
|
|
||||||
network --bootproto=dhcp --device=link --activate --onboot=on
|
network --bootproto=dhcp --device=link --activate --onboot=on
|
||||||
services --enabled=NetworkManager,sshd,rngd
|
services --enabled=NetworkManager,sshd
|
||||||
|
|
||||||
zerombr
|
zerombr
|
||||||
clearpart --all --initlabel --disklabel=msdos
|
clearpart --all --initlabel --disklabel=msdos
|
||||||
|
@ -19,7 +19,7 @@ autopart --nohome --noswap --type=plain
|
||||||
|
|
||||||
# Equivalent of %include fedora-repo.ks
|
# Equivalent of %include fedora-repo.ks
|
||||||
# Pull from the ostree repo that was created during the compose
|
# Pull from the ostree repo that was created during the compose
|
||||||
ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/rawhide/${basearch}/iot
|
ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
|
||||||
|
|
||||||
reboot
|
reboot
|
||||||
|
|
||||||
|
@ -45,14 +45,14 @@ fi
|
||||||
|
|
||||||
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
|
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
|
||||||
# We want consumers of this image to track the two week releases.
|
# We want consumers of this image to track the two week releases.
|
||||||
ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/rawhide/${arch}/iot"
|
ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot"
|
||||||
|
|
||||||
# Make sure the ref we're supposedly sitting on (according
|
# Make sure the ref we're supposedly sitting on (according
|
||||||
# to the updated origin) exists.
|
# to the updated origin) exists.
|
||||||
ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
|
ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
|
||||||
|
|
||||||
# Remove the old ref so that the commit eventually gets cleaned up.
|
# Remove the old ref so that the commit eventually gets cleaned up.
|
||||||
ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
|
ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
|
||||||
|
|
||||||
# delete/add the remote with new options to enable gpg verification
|
# delete/add the remote with new options to enable gpg verification
|
||||||
# and to point them at the cdn url
|
# and to point them at the cdn url
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# remove input methods to free space
|
# remove input methods to free space
|
||||||
%packages
|
%packages
|
||||||
-@input-methods
|
|
||||||
-scim*
|
-scim*
|
||||||
-iok
|
-iok
|
||||||
%end
|
%end
|
||||||
|
|
|
@ -113,7 +113,8 @@ gimp
|
||||||
kst
|
kst
|
||||||
kst-docs
|
kst-docs
|
||||||
kst-fits
|
kst-fits
|
||||||
LabPlot
|
# LabPlot currently not installable due to #2044284
|
||||||
|
#LabPlot
|
||||||
|
|
||||||
#Misc. Utils
|
#Misc. Utils
|
||||||
ImageMagick
|
ImageMagick
|
||||||
|
|
|
@ -85,6 +85,15 @@ cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
|
||||||
alreadyMigrated=true
|
alreadyMigrated=true
|
||||||
KWALLET_EOL
|
KWALLET_EOL
|
||||||
|
|
||||||
|
# Disable automount of 'known' devices
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2073708
|
||||||
|
cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF
|
||||||
|
[General]
|
||||||
|
AutomountEnabled=false
|
||||||
|
AutomountOnLogin=false
|
||||||
|
AutomountOnPlugin=false
|
||||||
|
AUTOMOUNTER_EOF
|
||||||
|
|
||||||
# make sure to set the right permissions and selinux contexts
|
# make sure to set the right permissions and selinux contexts
|
||||||
chown -R liveuser:liveuser /home/liveuser/
|
chown -R liveuser:liveuser /home/liveuser/
|
||||||
restorecon -R /home/liveuser/
|
restorecon -R /home/liveuser/
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
%include fedora-kde-minimization.ks
|
%include fedora-kde-minimization.ks
|
||||||
|
|
||||||
# DVD payload
|
# DVD payload
|
||||||
part / --size=7200
|
part / --size=7500
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%end
|
%end
|
||||||
|
|
|
@ -107,6 +107,7 @@ FOE
|
||||||
# disable updates plugin
|
# disable updates plugin
|
||||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
|
cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
|
||||||
[org.gnome.software]
|
[org.gnome.software]
|
||||||
|
allow-updates=false
|
||||||
download-updates=false
|
download-updates=false
|
||||||
FOE
|
FOE
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
|
||||||
# disable gnome-software automatically downloading updates
|
# disable gnome-software automatically downloading updates
|
||||||
cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
|
cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
|
||||||
[org.gnome.software]
|
[org.gnome.software]
|
||||||
|
allow-updates=false
|
||||||
download-updates=false
|
download-updates=false
|
||||||
FOE
|
FOE
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,12 @@ fusion-icon
|
||||||
# blacklist applications which breaks mate-desktop
|
# blacklist applications which breaks mate-desktop
|
||||||
-audacious
|
-audacious
|
||||||
|
|
||||||
|
# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
|
||||||
|
# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
|
||||||
|
# use earlyoom instead of systemd-oomd-defaults
|
||||||
|
earlyoom
|
||||||
|
-systemd-oomd-defaults
|
||||||
|
|
||||||
# office
|
# office
|
||||||
@libreoffice
|
@libreoffice
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,9 @@ python3-pillow-tk
|
||||||
# This is no longer workstation
|
# This is no longer workstation
|
||||||
-@workstation-product
|
-@workstation-product
|
||||||
|
|
||||||
|
# But we want to keep the Fedora desktop backgrounds
|
||||||
|
desktop-backgrounds-gnome
|
||||||
|
|
||||||
# Add a web browser
|
# Add a web browser
|
||||||
@firefox
|
@firefox
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -78,7 +78,8 @@ cat /etc/fedora-release >> /boot/olpc_build
|
||||||
# Rebuild initrd for Sugar boot screen
|
# Rebuild initrd for Sugar boot screen
|
||||||
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
|
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
|
||||||
/usr/sbin/plymouth-set-default-theme sugar
|
/usr/sbin/plymouth-set-default-theme sugar
|
||||||
dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
|
sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf
|
||||||
|
dracut --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
|
||||||
|
|
||||||
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
||||||
rm -f /var/lib/rpm/__db*
|
rm -f /var/lib/rpm/__db*
|
||||||
|
@ -109,3 +110,14 @@ EOF
|
||||||
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
|
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
|
||||||
|
|
||||||
%end
|
%end
|
||||||
|
|
||||||
|
%post --nochroot
|
||||||
|
|
||||||
|
for n in initramfs initrd; do
|
||||||
|
for img in "$LIVE_ROOT/images/pxeboot/$n"* ; do
|
||||||
|
[ -e "$img" ] && cp -a "$INSTALL_ROOT"/boot/initramfs-*.img "$img"
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
%end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue