From patchwork Mon Jan 19 16:14:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 430592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id DCF3D1401F6 for ; Tue, 20 Jan 2015 03:15:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D0671A1D42; Mon, 19 Jan 2015 16:15:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QFt5p4DJBEdN; Mon, 19 Jan 2015 16:15:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 19C03A1F47; Mon, 19 Jan 2015 16:15:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DC3981C203A for ; Mon, 19 Jan 2015 16:14:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D7EE192513 for ; Mon, 19 Jan 2015 16:14:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1WuxU0N7NxCQ for ; Mon, 19 Jan 2015 16:14:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 16C9892512 for ; Mon, 19 Jan 2015 16:14:47 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id m14so7069526wev.11 for ; Mon, 19 Jan 2015 08:14:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=8Ml4x8ElMXCrEDdAZHUKx4eefSOHQkSz2YEKLz7z+js=; b=kFnHl+Wneufxn9EwbMssiXwsGAzQHq4SAJVZgf7HINPfzjLyRSOFIeQ36zRB+fNaVt fNmeQwsw0kbwvSDSAPSjtLDk5v2QiwBddLFBIMylvyIzK4mSU0f/Eoel4fVDJpMKBOOf eIh6o9FJVoRaQM5cSMMtTKR1KZK4cvfvGSLcUWMm9ogeX+S9z3jm/dQOaaEK2yfMrvgQ pEcu4JE5UtKfwF4SOriYbcA0o1nexmOjGCz335G76Fnggsu89pUMWGlCMlO88fO8VynP +NfxFYf/PeyiznPBeWHU/5RG8cQUm0Qa0kGxz6VNRsQ14a6ZFHpnGFJE+tzYQvIYiT96 ud0w== X-Received: by 10.180.187.67 with SMTP id fq3mr35979428wic.37.1421684085752; Mon, 19 Jan 2015 08:14:45 -0800 (PST) Received: from ideapad.lan (199-13-179-94.pool.ukrtel.net. [94.179.13.199]) by mx.google.com with ESMTPSA id fc6sm14735765wib.12.2015.01.19.08.14.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 08:14:45 -0800 (PST) From: Maxim Mikityanskiy To: buildroot@busybox.net Date: Mon, 19 Jan 2015 18:14:12 +0200 Message-Id: <1421684056-5266-13-git-send-email-maxtram95@gmail.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> References: <1421684056-5266-1-git-send-email-maxtram95@gmail.com> Subject: [Buildroot] [PATCH 12/16] package/samba: add systemd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add {smbd,nmbd,winbindd}.service files for systemd. Add tmpfiles.d config file to create samba directories. Signed-off-by: Maxim Mikityanskiy --- package/samba/nmbd.service | 12 ++++++++++++ package/samba/samba.mk | 23 +++++++++++++++++++++++ package/samba/samba_tmpfiles.conf | 4 ++++ package/samba/smbd.service | 12 ++++++++++++ package/samba/winbindd.service | 12 ++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/samba/nmbd.service create mode 100644 package/samba/samba_tmpfiles.conf create mode 100644 package/samba/smbd.service create mode 100644 package/samba/winbindd.service diff --git a/package/samba/nmbd.service b/package/samba/nmbd.service new file mode 100644 index 0000000..6e241ea --- /dev/null +++ b/package/samba/nmbd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Samba NetBIOS name server +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/samba/nmbd.pid +ExecStart=/usr/sbin/nmbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/package/samba/samba.mk b/package/samba/samba.mk index 31ad644..5a11ebe 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -182,6 +182,29 @@ endef SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_CONFIG +ifeq ($(BR2_INIT_SYSTEMD),y) +define SAMBA_INSTALL_TMPFILES_HOOK + $(INSTALL) -D -m 644 package/samba/samba_tmpfiles.conf \ + $(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf +endef + +SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_INSTALL_TMPFILES_HOOK +endif + +define SAMBA_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/samba/smbd.service \ + $(TARGET_DIR)/lib/systemd/system/smbd.service + $(INSTALL) -D -m 644 package/samba/nmbd.service \ + $(TARGET_DIR)/lib/systemd/system/nmbd.service + $(if $(BR2_PACKAGE_SAMBA_WINBINDD),$(INSTALL) -D -m 644 package/samba/winbindd.service $(TARGET_DIR)/lib/systemd/system/winbindd.service) + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants + ln -fs /lib/systemd/system/smbd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smbd.service + ln -fs /lib/systemd/system/nmbd.service \ + $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmbd.service + $(if $(BR2_PACKAGE_SAMBA_WINBINDD),ln -fs /lib/systemd/system/winbindd.service $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbindd.service) +endef + define SAMBA_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/samba/S91smb $(TARGET_DIR)/etc/init.d/S91smb endef diff --git a/package/samba/samba_tmpfiles.conf b/package/samba/samba_tmpfiles.conf new file mode 100644 index 0000000..e265f75 --- /dev/null +++ b/package/samba/samba_tmpfiles.conf @@ -0,0 +1,4 @@ +d /var/cache/samba 0755 root root - +d /var/log/samba 0755 root root - +d /var/lock/samba 0755 root root - +d /var/run/samba 0755 root root - diff --git a/package/samba/smbd.service b/package/samba/smbd.service new file mode 100644 index 0000000..64abf56 --- /dev/null +++ b/package/samba/smbd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Samba SMB/CIFS server +After=network.target nmbd.service winbindd.service + +[Service] +Type=forking +PIDFile=/var/run/samba/smbd.pid +ExecStart=/usr/sbin/smbd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/package/samba/winbindd.service b/package/samba/winbindd.service new file mode 100644 index 0000000..214c17e --- /dev/null +++ b/package/samba/winbindd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Samba Winbind daemon +After=network.target nmbd.service + +[Service] +Type=forking +PIDFile=/var/run/samba/winbindd.pid +ExecStart=/usr/sbin/winbindd -D +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target