mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-12-23 19:53:10 +00:00
fedora-live-base,fedora-soas: livecd-iso-to-disk in .iso filesystem.
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:
parent
7045d91878
commit
70c3d795e8
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user