srbala
/
fedora-kickstarts
mirror of https://pagure.io/fedora-kickstarts.git
1
1
Fork 1
Code Issues Releases Activity

fedora-live-base: Handle livecd-creator vs. livemedia-creator builds 

Test for $LIVE_ROOT (set by livecd-creator) before running commands
specific to a livecd-creator build.

Do not modify the Lorax template during livemedia-creator builds;
the change belongs in Lorax itself.

Related: https://github.com/weldr/lorax/pull/1107

Resolves: rhbz#1430546
This commit is contained in:
David Ward 2021-01-18 10:54:59 -05:00 committed by kevin
parent 038b05bb22
commit ec3a12d0db
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fedora-live-base.ks
View File

@ -327,23 +327,15 @@ touch /etc/machine-id
%post --nochroot
cp $INSTALL_ROOT/usr/share/licenses/*-release-common/* $LIVE_ROOT/
# For livecd-creator builds only (lorax/livemedia-creator handles this directly)
if [ -n "$LIVE_ROOT" ]; then
cp "$INSTALL_ROOT"/usr/share/licenses/*-release-common/* "$LIVE_ROOT/"
# only works on x86, x86_64
if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
# For livecd-creator builds
if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
# 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
# only installed on x86, x86_64
if [ -f /usr/bin/livecd-iso-to-disk ]; then
mkdir -p "$LIVE_ROOT/LiveOS"
cp /usr/bin/livecd-iso-to-disk "$LIVE_ROOT/LiveOS"
fi
fi
%end