davidlt/fedora-kickstarts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fedora-live-base,fedora-soas: livecd-iso-to-disk in .iso filesystem.

Browse Source 
For livemedia-creator builds, inject install code into the lorax
template live/x86.tmpl that copies the script livecd-iso-to-disk
into the .iso filesystem at /LiveOS when livecd-tools is present in
the install image. This fixes commit 18d30b3, which failed in this.
This commit is contained in:
Frederick Grose 2018-10-31 22:14:54 -04:00
parent 7045d91878
commit 70c3d795e8
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fedora-live-base.ks
View File

@ -342,8 +342,19 @@ cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
# only works on x86, x86_64
if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
# 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
fi
%end

10
fedora-soas-common.ks
View File

@ -165,14 +165,4 @@ automatic=true
EOF
/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