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 F339A138CBD for ; Thu, 12 Mar 2015 02:28:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67119E08BE; Thu, 12 Mar 2015 02:28:18 +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 0E7E8E08BE for ; Thu, 12 Mar 2015 02:28:17 +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 CA915340AEF for ; Thu, 12 Mar 2015 02:28:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C18D138FE for ; Thu, 12 Mar 2015 02:28:12 +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: <1426127268.0b4a7da25051c864ab5ecb23fd869dd6ede7af0a.twitch153@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/desktop/run-base.sh X-VCS-Directories: tools-hardened/desktop/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 0b4a7da25051c864ab5ecb23fd869dd6ede7af0a X-VCS-Branch: master Date: Thu, 12 Mar 2015 02:28:12 +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: 6a0b75c6-fe44-4f31-a977-e3b00bd7cf15 X-Archives-Hash: b3472357ec50a9396b880a8438567be4 commit: 0b4a7da25051c864ab5ecb23fd869dd6ede7af0a Author: Devan Franchini gentoo org> AuthorDate: Thu Mar 12 02:27:31 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Thu Mar 12 02:27:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0b4a7da2 tools-hardened/desktop run-base.sh: setup_systemd() cleans up services This commit cleans up the services to reflect the services listed at: http://tinhat.sourceforge.net/?q=technical tools-hardened/desktop/run-base.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools-hardened/desktop/run-base.sh b/tools-hardened/desktop/run-base.sh index d79469a..7cd525b 100755 --- a/tools-hardened/desktop/run-base.sh +++ b/tools-hardened/desktop/run-base.sh @@ -97,9 +97,6 @@ setup_initrc() { setup_systemd() { ln -sf /proc/self/mounts /etc/mtab sed -i -e 's/#GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="init=\/usr\/lib\/systemd\/systemd"/' "${ROOTFS}"/etc/default/grub - chroot "${ROOTFS}"/ systemctl enable avahi-daemon.service - chroot "${ROOTFS}"/ systemctl enable bluetooth.service - chroot "${ROOTFS}"/ systemctl enable cups.service chroot "${ROOTFS}"/ systemctl enable dhcpcd.service chroot "${ROOTFS}"/ systemctl enable cronie.service chroot "${ROOTFS}"/ systemctl enable gdm.service @@ -109,11 +106,10 @@ setup_systemd() { 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 - #chroot "${ROOTFS}"/ systemctl enable udev-settle.service - #chroot "${ROOTFS}"/ systemctl enable udev-trigger.service + chroot "${ROOTFS}"/ systemctl disable avahi-daemon.service + chroot "${ROOTFS}"/ systemctl disable bluetooth.serivce + chroot "${ROOTFS}"/ systemctl disable cups.service } cleanup_dirs() {