From d25acba64bf60aa6ccea4f94d1d0029322f52d45 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 10 May 2006 15:55:28 +0000 Subject: [PATCH] Fix detection of the Installer. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1133 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/support/livecdfs-update.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d78cf372..88d300fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.617 2006/05/10 13:23:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.618 2006/05/10 15:55:28 wolf31o2 Exp $ + + 10 May 2006; Chris Gianelloni + targets/support/livecdfs-update.sh: + Fix detection of the Installer. 10 May 2006; Chris Gianelloni arch/ppc64.py: Added 970, power3, power4, and power5 sub-arches for ppc64. diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 468cbc01..6e26aa23 100755 --- 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.47 2006/05/09 12:20:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.48 2006/05/10 15:55:28 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -310,7 +310,7 @@ case ${clst_livecd_type} in rm -f /var/log/lastlog && touch /var/log/lastlog # Create our installer icons - if [ -e /usr/share/applications/installer-gli.desktop ] + if [ -e /usr/share/applications/installer-gtk.desktop ] then if [ -n "${clst_livecd_users}" ] then -- 2.26.2