Remove sed from splash section, since it wasn't actually resolving the issue, anyway...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1167 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index be96f3431fc6dc2a08ad1a514f11c38a37eec429..1a9ecc645d44fa7af027013c972429ccc9a9908a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.651 2006/07/26 22:38:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.652 2006/07/29 18:35:06 wolf31o2 Exp $
+
+  29 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  Remove sed from splash section, since it wasn't actually resolving the
+  issue, anyway. Change the installer's dialog front-end code to simply run
+  via sudo, since we don't need to worry about having the X DISPLAY setup or
+  anything. This is catalyst 2.0, so you guys can all start rejoicing.
 
   26 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index b3f742e248b050ca6c7336ef4ba7f6e619d833b5..98038937e5137497a0534befe092fff588ba7d35 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.160 2006/07/19 21:39:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.161 2006/07/29 18:35:06 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc50"
+__version__="2.0"
 
 conf_values={}
 

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index c2faf7b8f38641beb01d43dfacd3f885cb592e65..52d3333d42548eb81c82db9551396a38fe616d73 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.57 2006/07/26 22:38:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.58 2006/07/29 18:35:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -184,9 +184,6 @@ then
                        -e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
                        -e "/^# SPLASH_TTYS=/ s/^#//" \
                        /etc/conf.d/splash
-               sed -i \
-                       -e 's/type}" cachedir "${spl_/type}" tmpfs "${spl_/' \
-                       /sbin/splash-functions.sh
                rm -f /etc/splash/default
                ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
        else
@@ -343,7 +340,7 @@ case ${clst_livecd_type} in
                                                /home/${username}/Desktop
                                        cp /usr/share/applications/installer-dialog.desktop \
                                                /home/${username}/Desktop
-                                       sed -i -e 's:Exec=installer-dialog:Exec=installer dialog:' \
+                                       sed -i -e 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
                                                /home/${username}/Desktop/installer-dialog.desktop
                                        sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
                                                /home/${username}/Desktop/installer-gtk.desktop