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 692AE138A1A for ; Sat, 14 Feb 2015 04:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A96B0E0955; Sat, 14 Feb 2015 04:13:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45C11E0955 for ; Sat, 14 Feb 2015 04:13:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CADE734084F for ; Sat, 14 Feb 2015 04:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87F7C11B6D for ; Sat, 14 Feb 2015 04:13:34 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1423887169.de943032fe0e2ae7c831ee7685a7b78c431c1c9f.twitch153@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/desktop/fluxbox-run.sh X-VCS-Directories: tools-hardened/desktop/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: de943032fe0e2ae7c831ee7685a7b78c431c1c9f X-VCS-Branch: master Date: Sat, 14 Feb 2015 04:13:34 +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: 1ea9a5be-a2af-4906-9cab-ba9821ba49d4 X-Archives-Hash: 36bd9755b7d1031a34c657bc9c195c5c commit: de943032fe0e2ae7c831ee7685a7b78c431c1c9f Author: Devan Franchini gentoo org> AuthorDate: Sat Feb 14 04:12:49 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Sat Feb 14 04:12:49 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=de943032 fluxbox-run.sh: Moves background setting sed lower down in setup_usergroups () function --- tools-hardened/desktop/fluxbox-run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools-hardened/desktop/fluxbox-run.sh b/tools-hardened/desktop/fluxbox-run.sh index d297cfa..bf66e73 100755 --- a/tools-hardened/desktop/fluxbox-run.sh +++ b/tools-hardened/desktop/fluxbox-run.sh @@ -28,8 +28,8 @@ setup_usergroups() { cp -f files/usermenu "${ROOTFS}"/usr/share/fluxbox/ cp -f files/fluxbox-startup "${ROOTFS}"/usr/share/fluxbox/startup - sed -i '2 i\fbsetbg \/usr\/share\/backgrounds\/backgrounds.jpg' "${ROOTFS}"/etc/skel/.xinitrc sed -i 's/^\/usr\/*.*/exec startfluxbox/' "${ROOTFS}"/etc/skel/.xinitrc + sed -i '2 i\fbsetbg \/usr\/share\/backgrounds\/background.jpg' "${ROOTFS}"/etc/skel/.xinitrc mkdir -p "${ROOTFS}"/etc/skel/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf,.fluxbox} chmod 700 "${ROOTFS}"/etc/skel/.ssh @@ -39,6 +39,7 @@ setup_usergroups() { rm -rf "${ROOTFS}"/home/thuser cp -a thuser "${ROOTFS}"/home/thuser sed -i -e 's/^\/usr\/*.*/exec startfluxbox/' "${ROOTFS}"/home/thuser/.xinitrc + sed -i '2 i\fbsetbg \/usr\/share\/backgrounds\/background.jpg' "${ROOTFS}"/etc/skel/.xinitrc cp -a files/{Encrypt,Save,Utilities} "${ROOTFS}"/home/thuser rm -rf "${ROOTFS}"/home/thuser/Utilities/post_gnome3_install.sh mkdir -p "${ROOTFS}"/home/thuser/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf,.fluxbox} @@ -49,7 +50,6 @@ setup_usergroups() { chroot "${ROOTFS}"/ chown -R thuser:thuser /home/thuser sed -i 's/# \(%wheel.*NOPASSWD\)/\1/' "${ROOTFS}"/etc/sudoers - sed -i 's/^\/usr\/*.*/\/usr\/bin\/fluxbox/' "${ROOTFS}"/etc/skel/.xinitrc } setup_confs() {