From eb2710c2ad73d7566723917cfbf17e11a23e27eafa3ff3ba3d9aa76561954940 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 10 Nov 2014 10:17:04 +0000 Subject: [PATCH] Accepting request 260489 from home:Ledest:misc fix bashisms in pre script OBS-URL: https://build.opensuse.org/request/show/260489 OBS-URL: https://build.opensuse.org/package/show/network/keepalived?expand=0&rev=10 --- keepalived.changes | 5 +++++ keepalived.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/keepalived.changes b/keepalived.changes index 745a945..3e3543c 100644 --- a/keepalived.changes +++ b/keepalived.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Nov 09 05:21:00 UTC 2014 - Led + +- fix bashisms in pre script + ------------------------------------------------------------------- Thu Jul 31 14:28:08 UTC 2014 - dimstar@opensuse.org diff --git a/keepalived.spec b/keepalived.spec index 8d224df..bc9bbcc 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -83,8 +83,8 @@ chmod -R o= %{buildroot}/etc/keepalived rm -rv %{buildroot}/etc/keepalived/samples/ %pre -/usr/sbin/groupadd -r %{name} &>/dev/null || : -/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" -d %{_var}/lib/%{name} %{name} &>/dev/null || : +/usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : +/usr/sbin/useradd -g %{name} -s /bin/false -r -c "Keepalived" -d %{_var}/lib/%{name} %{name} >/dev/null 2>&1 || : %if 0%{?has_systemd} %service_add_pre %{name}.service %{name}.socket %endif