remove extraneous posts
This commit is contained in:
nazunalika
parent
50ae667781
commit
02d4ef974a
GPG Key ID:
6735C0E1BD65D048
@ -311,32 +311,6 @@ rm -f /boot/*-rescue*
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
# set default GTK+ theme for root (see #683855, #689070, #808062)
|
||||
cat > /root/.gtkrc-2.0 << EOF
|
||||
include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
|
||||
@ -446,6 +420,28 @@ dnf config-manager --set-enabled powertools
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
@^kde-desktop-environment
|
||||
@anaconda-tools
|
||||
|
||||
@ -309,32 +309,6 @@ rm -f /boot/*-rescue*
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# This only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
cat >> /etc/rc.d/init.d/livesys << EOF
|
||||
|
||||
|
||||
@ -422,6 +396,28 @@ EOF
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# This only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
@anaconda-tools
|
||||
@base-x
|
||||
|
||||
@ -309,32 +309,6 @@ rm -f /boot/*-rescue*
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# This only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
|
||||
cat >> /etc/rc.d/init.d/livesys << EOF
|
||||
|
||||
|
||||
@ -422,6 +396,28 @@ EOF
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# This only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
@anaconda-tools
|
||||
@base-x
|
||||
|
||||
@ -311,31 +311,6 @@ rm -f /boot/*-rescue*
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%post
|
||||
# xfce configuration
|
||||
|
||||
# create /etc/sysconfig/desktop (needed for installation)
|
||||
@ -434,6 +409,28 @@ dnf config-manager --set-enabled powertools
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot
|
||||
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
|
||||
|
||||
# only works on 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
|
||||
fi
|
||||
|
||||
%end
|
||||
|
||||
%packages
|
||||
@anaconda-tools
|
||||
@base-x
|
||||
@ -516,3 +513,4 @@ xdg-user-dirs-gtk
|
||||
-xsane-gimp
|
||||
|
||||
%end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user