From c8f8395f41b30cef6ee18709b70662a85867ce49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 5 May 2017 12:23:43 +0100 Subject: [PATCH] meson: fail silently in ptp helper post install script .. in case permissions/capabilities could not be set. --- libs/gst/helpers/ptp_helper_post_install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gst/helpers/ptp_helper_post_install.sh b/libs/gst/helpers/ptp_helper_post_install.sh index 5e86773..eefe1c9 100755 --- a/libs/gst/helpers/ptp_helper_post_install.sh +++ b/libs/gst/helpers/ptp_helper_post_install.sh @@ -11,14 +11,14 @@ case "$with_ptp_helper_permissions" in setuid-root) echo "$0: permissions before: " ls -l "$ptp_helper" - chown root "$ptp_helper" - chmod u+s "$ptp_helper" + chown root "$ptp_helper" || true + chmod u+s "$ptp_helper" || true echo "$0: permissions after: " ls -l "$ptp_helper" ;; capabilities) echo "Calling $setcap cap_net_bind_service,cap_net_admin+ep $ptp_helper" - $setcap cap_net_bind_service,cap_net_admin+ep "$ptp_helper" + $setcap cap_net_bind_service,cap_net_admin+ep "$ptp_helper" || true ;; *) echo "$0 ERROR: unexpected permissions value '$with_ptp_helper_permissions'"; -- 2.7.4