diff options
| author |   Devan Franchini <twitch153@gentoo.org> | 2015-02-13 23:12:49 -0500 |
|---|---|---|
| committer | Devan Franchini <twitch153@gentoo.org> | 2015-02-13 23:12:49 -0500 |
| commit | de943032fe0e2ae7c831ee7685a7b78c431c1c9f (patch) | |
| tree | 003496f5e3b23fda34fa00e4a6259cdd3776476a /tools-hardened | |
| parent | tools-hardened/desktop/package.gnome.use.{1,2}: Removes line which sets USE f... (diff) | |
| download | releng-de943032fe0e2ae7c831ee7685a7b78c431c1c9f.tar.gz releng-de943032fe0e2ae7c831ee7685a7b78c431c1c9f.tar.bz2 releng-de943032fe0e2ae7c831ee7685a7b78c431c1c9f.zip | |
fluxbox-run.sh: Moves background setting sed lower down in setup_usergroups () function
Diffstat (limited to 'tools-hardened')
| -rwxr-xr-x | tools-hardened/desktop/fluxbox-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools-hardened/desktop/fluxbox-run.sh b/tools-hardened/desktop/fluxbox-run.sh index d297cfaa..bf66e73c 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() { |