| 1 |
commit: 7c2d3c72284d5ceb665ff26743f380571f70bf04 |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 23 16:17:06 2014 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 24 21:00:02 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=7c2d3c72 |
| 7 |
|
| 8 |
tools-hardened: gnome3-th, changes from using gdm to slim as login manager |
| 9 |
|
| 10 |
--- |
| 11 |
tools-hardened/desktop/files/gnome-world | 1 + |
| 12 |
tools-hardened/desktop/gnome3-run.sh | 14 +++++++++----- |
| 13 |
tools-hardened/desktop/run-base.sh | 2 ++ |
| 14 |
3 files changed, 12 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/tools-hardened/desktop/files/gnome-world b/tools-hardened/desktop/files/gnome-world |
| 17 |
index e31e899..3749935 100644 |
| 18 |
--- a/tools-hardened/desktop/files/gnome-world |
| 19 |
+++ b/tools-hardened/desktop/files/gnome-world |
| 20 |
@@ -30,3 +30,4 @@ sys-process/at |
| 21 |
sys-process/fcron |
| 22 |
www-client/firefox |
| 23 |
x11-base/xorg-server |
| 24 |
+x11-misc/slim |
| 25 |
|
| 26 |
diff --git a/tools-hardened/desktop/gnome3-run.sh b/tools-hardened/desktop/gnome3-run.sh |
| 27 |
index 5dbf9e2..1280520 100755 |
| 28 |
--- a/tools-hardened/desktop/gnome3-run.sh |
| 29 |
+++ b/tools-hardened/desktop/gnome3-run.sh |
| 30 |
@@ -46,7 +46,11 @@ setup_usergroups() { |
| 31 |
setup_confs() { |
| 32 |
local IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg" |
| 33 |
|
| 34 |
- sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1gdm/' "${ROOTFS}"/etc/conf.d/xdm |
| 35 |
+ sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm |
| 36 |
+ sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf |
| 37 |
+ sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login ~/.xinitrc' "${ROOTFS}"/etc/slim.conf |
| 38 |
+ sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf |
| 39 |
+ sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' "${ROOTFS}"/etc/slim.conf |
| 40 |
|
| 41 |
wget -O "${ROOTFS}"/usr/share/backgrounds/background.jpg "${IMAGE}" |
| 42 |
|
| 43 |
@@ -54,12 +58,12 @@ setup_confs() { |
| 44 |
sed -i '/^GENTOO_MIRRORS/d' "${ROOTFS}"/etc/portage/make.conf |
| 45 |
sed -i 's/^MAKEOPTS/#MAKEOPTS/' "${ROOTFS}"/etc/portage/make.conf |
| 46 |
sed -i 's/^exec \/sbin\/*.*/exec \/sbin\/switch_root \/mnt\/tmpfs \/usr\/lib\/systemd\/systemd/' configs/init |
| 47 |
- sed -i 's/^clock=\"*.*\"$/clock=\"local\"/' "${ROOTFS}"/etc/conf.d/hwclock |
| 48 |
+ sed -i 's/^clock=\"*.*\"$/clock=\"local\"/' "${ROOTFS}"/etc/conf.d/hwclock |
| 49 |
|
| 50 |
- cp -a files/locale/locale.gen "${ROOTFS}"/etc/ |
| 51 |
- chroot "${ROOTFS}"/ locale-gen |
| 52 |
+ cp -a files/locale/locale.gen "${ROOTFS}"/etc/ |
| 53 |
+ chroot "${ROOTFS}"/ locale-gen |
| 54 |
|
| 55 |
- cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/ |
| 56 |
+ cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/ |
| 57 |
# In kernels 3.9 and above, we must disallow-other-stacks because of SO_REUSEPORT |
| 58 |
sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' "${ROOTFS}"/etc/avahi/avahi-daemon.conf |
| 59 |
} |
| 60 |
|
| 61 |
diff --git a/tools-hardened/desktop/run-base.sh b/tools-hardened/desktop/run-base.sh |
| 62 |
index b9178c8..12a0ee5 100755 |
| 63 |
--- a/tools-hardened/desktop/run-base.sh |
| 64 |
+++ b/tools-hardened/desktop/run-base.sh |
| 65 |
@@ -106,6 +106,8 @@ setup_systemd() { |
| 66 |
chroot "${ROOTFS}"/ systemctl enable metalog.service |
| 67 |
chroot "${ROOTFS}"/ systemctl enable NetworkManager.service |
| 68 |
chroot "${ROOTFS}"/ systemctl enable postfix.service |
| 69 |
+ chroot "${ROOTFS}"/ systemctl disable gdm |
| 70 |
+ chroot "${ROOTFS}"/ systemctl enable slim |
| 71 |
chroot "${ROOTFS}"/ systemctl enable smbd.service |
| 72 |
chroot "${ROOTFS}"/ systemctl enable sshd.service |
| 73 |
#chroot "${ROOTFS}"/ systemctl enable udev.service |
Archives
