Merge #426 fedora-soas: Include livecd-iso-to-disk in .iso filesystem.

This commit is contained in:
Kevin Fenzi 2018-09-22 17:43:17 +00:00
commit 18d30b363c
2 changed files with 12 additions and 4 deletions

View File

@ -5,8 +5,6 @@
# #
# Maintainers: # Maintainers:
# - Peter Robinson <pbrobinson AT gmail DOT com> # - Peter Robinson <pbrobinson AT gmail DOT com>
# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
# - Mel Chua <mchua AT fedoraproject DOT org>
%include fedora-live-base.ks %include fedora-live-base.ks
%include fedora-live-minimization.ks %include fedora-live-minimization.ks

View File

@ -92,7 +92,7 @@ sugar-logos
# 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
/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION dracut -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*
@ -163,6 +163,16 @@ show-logout=false
[org.sugarlabs.power] [org.sugarlabs.power]
automatic=true automatic=true
EOF EOF
/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
# For lorax/livemedia-creator builds.
sed -i '
/## make boot.iso/ i\
# Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
<% f = "usr/bin/livecd-iso-to-disk" %>\
%if exists(f):\
install ${f} ${LIVEDIR}/${f|basename}\
%endif\
' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
%end %end