From: Chris Gianelloni Date: Wed, 27 Dec 2006 17:37:06 +0000 (+0000) Subject: Fix the display manager sed lines and change the icon for the local Handbook to use... X-Git-Tag: CATALYST_2_0_6_916~293 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78e0b15e283a81ad24ee5f34938d65d2a8891028;p=catalyst.git Fix the display manager sed lines and change the icon for the local Handbook to use the GNOME 2.16 icon for gedit. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1201 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 12a8f375..2c07894d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 27 Dec 2006; Chris Gianelloni + targets/support/chroot-functions.sh, targets/support/livecdfs-update.sh: + Fix the display manager sed lines and change the icon for the local Handbook + to use the GNOME 2.16 icon for gedit. + 27 Dec 2006; Chris Gianelloni modules/generic_stage_target.py: Changed the portage_overlay option to always install overlays in diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 103e2b76..edf6c6d9 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -261,5 +261,5 @@ Terminal=false Name=Gentoo Linux Handbook GenericName=Gentoo Linux Handbook Comment=This is a link to the local copy of the Gentoo Linux Handbook. -Icon=gedit-icon.png" > /usr/share/applications/gentoo-handbook.desktop +Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop } diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 2e603558..2fb7f6a6 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -129,9 +129,12 @@ fi # Setup configured display manager if [ -n "${clst_livecd_xdm}" ] then - sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ + sed -i \ + -e "s:DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ + -e ":^DISPLAYMANAGER: s:^#::" \ /etc/rc.conf - sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ + sed -i \ + -e "s:DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ /etc/conf.d/xdm fi