SoaS: use -N for dracut regeneration to ensure generic initrd

Minor other ordering and cleanup. Should fix issues for having host
specific initrd due to having already removed dracut-config-generic.
This commit is contained in:
Peter Robinson 2019-06-09 12:37:37 +01:00
parent 30013e8f38
commit 230e47abff

View File

@ -89,20 +89,20 @@ sugar-logos
%post %post
# Rebuild initrd for Sugar boot screen
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
/usr/sbin/plymouth-set-default-theme sugar
dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
# Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db*
# Get proper release naming in the control panel # Get proper release naming in the control panel
cat >> /boot/olpc_build << EOF cat >> /boot/olpc_build << EOF
Sugar on a Stick Sugar on a Stick
EOF EOF
cat /etc/fedora-release >> /boot/olpc_build cat /etc/fedora-release >> /boot/olpc_build
# Rebuild initrd for Sugar boot screen
KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
/usr/sbin/plymouth-set-default-theme sugar
dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
# Note that running rpm recreates the rpm db files which aren't needed or wanted
rm -f /var/lib/rpm/__db*
# Add our activities to the favorites # Add our activities to the favorites
cat > /usr/share/sugar/data/activities.defaults << EOF cat > /usr/share/sugar/data/activities.defaults << EOF
org.laptop.WebActivity org.laptop.WebActivity