[gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/, tools-hardened/desktop/files/

[Devan Franchini]

commit:     7c2d3c72284d5ceb665ff26743f380571f70bf04
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 23 16:17:06 2014 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 21:00:02 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=7c2d3c72

tools-hardened: gnome3-th, changes from using gdm to slim as login manager

---
 tools-hardened/desktop/files/gnome-world |  1 +
 tools-hardened/desktop/gnome3-run.sh     | 14 +++++++++-----
 tools-hardened/desktop/run-base.sh       |  2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tools-hardened/desktop/files/gnome-world 
b/tools-hardened/desktop/files/gnome-world
index e31e899..3749935 100644
--- a/tools-hardened/desktop/files/gnome-world
+++ b/tools-hardened/desktop/files/gnome-world
@@ -30,3 +30,4 @@ sys-process/at
 sys-process/fcron
 www-client/firefox
 x11-base/xorg-server
+x11-misc/slim

diff --git a/tools-hardened/desktop/gnome3-run.sh 
b/tools-hardened/desktop/gnome3-run.sh
index 5dbf9e2..1280520 100755
--- a/tools-hardened/desktop/gnome3-run.sh
+++ b/tools-hardened/desktop/gnome3-run.sh
@@ -46,7 +46,11 @@ setup_usergroups() {
 setup_confs() {
        local 
IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg";
 
-       sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1gdm/' "${ROOTFS}"/etc/conf.d/xdm
+       sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
+       sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
+       sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login 
~/.xinitrc' "${ROOTFS}"/etc/slim.conf
+       sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
+       sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' 
"${ROOTFS}"/etc/slim.conf
 
        wget -O "${ROOTFS}"/usr/share/backgrounds/background.jpg "${IMAGE}"
 
@@ -54,12 +58,12 @@ setup_confs() {
        sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf
        sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf
        sed -i 's/^exec \/sbin\/*.*/exec \/sbin\/switch_root \/mnt\/tmpfs 
\/usr\/lib\/systemd\/systemd/' configs/init
-        sed -i 's/^clock=\"*.*\"$/clock=\"local\"/' 
"${ROOTFS}"/etc/conf.d/hwclock
+       sed -i 's/^clock=\"*.*\"$/clock=\"local\"/' 
"${ROOTFS}"/etc/conf.d/hwclock
 
-        cp -a files/locale/locale.gen "${ROOTFS}"/etc/
-        chroot "${ROOTFS}"/ locale-gen
+       cp -a files/locale/locale.gen "${ROOTFS}"/etc/
+       chroot "${ROOTFS}"/ locale-gen
 
-        cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
+       cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
        # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT 
        sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' 
"${ROOTFS}"/etc/avahi/avahi-daemon.conf
 }

diff --git a/tools-hardened/desktop/run-base.sh 
b/tools-hardened/desktop/run-base.sh
index b9178c8..12a0ee5 100755
--- a/tools-hardened/desktop/run-base.sh
+++ b/tools-hardened/desktop/run-base.sh
@@ -106,6 +106,8 @@ setup_systemd() {
        chroot "${ROOTFS}"/ systemctl enable metalog.service
        chroot "${ROOTFS}"/ systemctl enable NetworkManager.service
        chroot "${ROOTFS}"/ systemctl enable postfix.service
+       chroot "${ROOTFS}"/ systemctl disable gdm
+       chroot "${ROOTFS}"/ systemctl enable slim
        chroot "${ROOTFS}"/ systemctl enable smbd.service
        chroot "${ROOTFS}"/ systemctl enable sshd.service
        #chroot "${ROOTFS}"/ systemctl enable udev.service