From patchwork Tue May 3 09:36:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Bark X-Patchwork-Id: 617865 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qzbfz5Zzqz9t44 for ; Tue, 3 May 2016 19:37:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=barkynet-com.20150623.gappssmtp.com header.i=@barkynet-com.20150623.gappssmtp.com header.b=ZH48yWMM; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3860D89548; Tue, 3 May 2016 09:37:14 +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 BSIlkQVJXdsK; Tue, 3 May 2016 09:37:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 936DA8954E; Tue, 3 May 2016 09:37:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 60CA21C1F4B for ; Tue, 3 May 2016 09:37:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B7D38B1DD for ; Tue, 3 May 2016 09:37:08 +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 9xk1WzfftyKz for ; Tue, 3 May 2016 09:37:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5F9288AF84 for ; Tue, 3 May 2016 09:37:07 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id e201so2711377wme.2 for ; Tue, 03 May 2016 02:37:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=barkynet-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JaHtEhxkL39lQkGrExbxW9fMKcq3iOYofoT1pVHReys=; b=ZH48yWMMSOvTv/F+CeVwo0vQbF0IFSL8jE+ou89AVddw90ClrP5atvj8dqULD6dA66 1iKV+ii77a5YLAty+SQkayxA4P9SeoqjtJSbyuEDgl591kYKkZ1xUyoBaCUHNOQD+JyD dUQA5XCV2QJ+kopgrlt7lEr0rWh49NYZ5F8lwX4vlvI5dUp2O82UJgf0bSs/hQwiKr2b +9ZyPRFNal0j3PFEnqm4DtOWwZWJIbzudQJyeYPibdCv53lwU+X9osUjns0YA2QYkfYE UCOLgVAsE9SOS0Gl9IjCjVDKpXVy/EYLkDOc/8gpZYQec+1fnvSnaJAKA0QqfKofauci T87w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=JaHtEhxkL39lQkGrExbxW9fMKcq3iOYofoT1pVHReys=; b=TWOAKC70fGjzYb6ctKRVf7h/aDkZDIMc0kd8xcr6hHtGlVX+oFnSBxwhdhQj/8q9Ju Yh7/KQciWqCCqet5OCPop3LWwpoPNR7PCAmJw+rhdvX/QctaNVuBogkvfkvMiutQXPiz vH9M+HbKNU1PShFcl3ANa2Rt2ajI4eGy5nrZCup9+Krmz4vQx9d0xL4q0D4zyc/1HrhJ IyG2Uy67DeLEIASeRhutT5Y6y63CEEwbIKs3FR+mmMkM61REEGj29F0N1Ha9XnxzJulx fZeO2URvZTB56Zy3yQsM0nE80/HFFn6IfxCEAtpVD3tAz7HVKyYlbX75NqtzJfUiu2EO jpqA== X-Gm-Message-State: AOPr4FVK07V4rXbnaHhHogS9TiKItqBXBqKiOlAaelkp7wMouOPyszyX2TCOIgApu8loSw== X-Received: by 10.194.190.201 with SMTP id gs9mr1949027wjc.133.1462268226025; Tue, 03 May 2016 02:37:06 -0700 (PDT) Received: from mail.home.barkynet.com (barkynet.plus.com. [80.229.219.126]) by smtp.gmail.com with ESMTPSA id c85sm22666337wmd.0.2016.05.03.02.37.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2016 02:37:05 -0700 (PDT) Received: from krusty.home.barkynet.com (krusty.home.barkynet.com [192.168.1.10]) by mail.home.barkynet.com (Postfix) with ESMTP id 8B4201E800; Tue, 3 May 2016 10:37:02 +0100 (BST) Received: by krusty.home.barkynet.com (Postfix, from userid 10000) id 117336C09D1; Tue, 3 May 2016 10:37:00 +0100 (BST) From: Martin Bark To: buildroot@buildroot.org Date: Tue, 3 May 2016 10:36:53 +0100 Message-Id: <1462268217-31545-2-git-send-email-martin@barkynet.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462268217-31545-1-git-send-email-martin@barkynet.com> References: <1462268217-31545-1-git-send-email-martin@barkynet.com> Subject: [Buildroot] [PATCH v2 2/6] package/nginx: fix error is nginx.service 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" When using systemd nginx fails to start with the error /usr/bin/mkdir: invalid option -- 't' This is due to a missing space before the semicolon in nginx.service. For systemd to handle multiple commands in ExecStartPre it requires the semicolon to be a separate word or the use of multiple ExecStartPre. This commit splits the multiple commands into two ExecStartPre lines which fixes the error and improves readability. Signed-off-by: Martin Bark --- Changes v1 -> v2 - Split single ExecStartPre into two ExecStartPre lines (suggested by Thomas Petazzoni) - Reorder before bump to 1.10.0 as this happens in 1.8.1 too --- package/nginx/nginx.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service index 619755f..320df9a 100644 --- a/package/nginx/nginx.service +++ b/package/nginx/nginx.service @@ -5,7 +5,8 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/nginx.pid -ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx; /usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' +ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx +ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit