Updated the livecd.sh fsscript so we don't fail on architectures/builds that don't have/use splashutils.
svn path=/trunk/; revision=275
This commit is contained in:
parent
9838600f39
commit
a88f3c26e8
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [ -e /etc/X11/gdm/custom.conf ]
|
if [[ -e /etc/X11/gdm/custom.conf ]]
|
||||||
then
|
then
|
||||||
sed -e '/^[^#]\+=.\+$/d' /etc/X11/gdm/custom.conf > \
|
sed -e '/^[^#]\+=.\+$/d' /etc/X11/gdm/custom.conf > \
|
||||||
/etc/X11/gdm/custom.conf.old
|
/etc/X11/gdm/custom.conf.old
|
||||||
|
@ -8,12 +8,23 @@ then
|
||||||
/etc/X11/gdm/custom.conf
|
/etc/X11/gdm/custom.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -e /etc/X11/gdm/gdm.conf ]
|
if [[ -e /etc/X11/gdm/gdm.conf ]]
|
||||||
then
|
then
|
||||||
sed -i -e 's/gentoo-emergence/gentoo-livecd-2007.0/' \
|
sed -i -e 's/gentoo-emergence/gentoo-livecd-2007.0/' \
|
||||||
/etc/X11/gdm/gdm.conf
|
/etc/X11/gdm/gdm.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -e /etc/conf.d/splash ]]
|
||||||
|
then
|
||||||
|
sed -i -e "/^# SPLASH_TTYS=/ s/^#//" /etc/conf.d/splash
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -e /sbin/splash-functions.sh ]]
|
||||||
|
then
|
||||||
|
sed -i -e 's/type" cachedir "${spl_/type" tmpfs "${spl_/' \
|
||||||
|
/sbin/splash-functions.sh
|
||||||
|
fi
|
||||||
|
|
||||||
gconftool-2 --direct \
|
gconftool-2 --direct \
|
||||||
--config-source xml:readwrite:/usr/livecd/gconf/gconf.xml.defaults \
|
--config-source xml:readwrite:/usr/livecd/gconf/gconf.xml.defaults \
|
||||||
--type string --set /desktop/gnome/background/picture_filename \
|
--type string --set /desktop/gnome/background/picture_filename \
|
||||||
|
@ -25,6 +36,3 @@ case `uname -m` in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
sed -i -e "/^# SPLASH_TTYS=/ s/^#//" /etc/conf.d/splash
|
|
||||||
sed -i -e 's/type" cachedir "${spl_/type" tmpfs "${spl_/' /sbin/splash-functions.sh
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue