From 5f68286a9a29740df4c7e7ae12a8a2f6325206237768dd7bd84c70b3d3f93e29 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 4 Jul 2019 15:20:59 +0000 Subject: [PATCH] Accepting request 713456 from home:alarrosa:branches:Virtualization:containers - Use /bin/bash instead of /usr/bin/bash in SLE12 OBS-URL: https://build.opensuse.org/request/show/713456 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/bubblewrap?expand=0&rev=19 --- bubblewrap.changes | 5 +++++ bubblewrap.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bubblewrap.changes b/bubblewrap.changes index 6fcb712..7f2161b 100644 --- a/bubblewrap.changes +++ b/bubblewrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 7 14:38:21 UTC 2019 - Antonio Larrosa + +- Use /bin/bash instead of /usr/bin/bash in SLE12 + ------------------------------------------------------------------- Sat Jun 1 15:08:49 UTC 2019 - Sebastian Wagner diff --git a/bubblewrap.spec b/bubblewrap.spec index 18e496c..519061f 100644 --- a/bubblewrap.spec +++ b/bubblewrap.spec @@ -43,7 +43,12 @@ user namespaces. %prep %autosetup -n %{name}-%{version} sed -i '1d' completions/bash/bwrap +%if 0%{?suse_version} < 1500 +sed -i '1s,/usr/bin/env bash,/bin/bash,' demos/bubblewrap-shell.sh +sed -i '1s/env //' demos/userns-block-fd.py +%else sed -i '1s/env //' demos/bubblewrap-shell.sh demos/userns-block-fd.py +%endif %build env NOCONFIGURE=1 ./autogen.sh