From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 546961382CB for ; Sat, 26 Oct 2013 20:10:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCDE8E08E1; Sat, 26 Oct 2013 20:10:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C400E0B2F for ; Sat, 26 Oct 2013 20:10:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07ACC33F0B6 for ; Sat, 26 Oct 2013 20:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B4E55E5464 for ; Sat, 26 Oct 2013 20:10:35 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1382808198.91e899fcfdef836c1c3026dcf128fd7eb026f67c.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 91e899fcfdef836c1c3026dcf128fd7eb026f67c X-VCS-Branch: master Date: Sat, 26 Oct 2013 20:10:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 050fea11-036e-4a05-b615-6f0b1f1b533b X-Archives-Hash: eddd845dfd628e206d0c34f02ede97a1 commit: 91e899fcfdef836c1c3026dcf128fd7eb026f67c Author: Matt Turner gmail com> AuthorDate: Fri Oct 11 22:06:14 2013 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Oct 26 17:23:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=91e899fc Revert "livecdfs-update.sh: Escape ampersands in STARTX sed expression" This reverts commit ed4d1623c3dac22ed008f518b79deecde1f33c26. The commit was a v1 commit that was supposed to be replaced. --- targets/support/livecdfs-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index b34e917..f8eb425 100644 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -378,7 +378,7 @@ esac if [ -e /etc/startx ] then sed -i \ - "s:##STARTX:source /etc/profile \&\& su - ${first_user} -c startx:" \ + "s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \ /root/.bashrc fi