about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2024-10-09 14:28:58 +0000
committerLaurent Bercot <ska@appnovation.com>2024-10-09 14:28:58 +0000
commit38fe66bb67f5375b4bd50f732080ed9ac25ce2e7 (patch)
tree4cf5bf315e6ac830144cd681662cf7a06980b3f7
parent80460c48ad1553dcb3396a70ccd86e9194371277 (diff)
downloadmdevd-main.tar.gz
mdevd-main.tar.xz
mdevd-main.zip
version: 0.1.6.5 v0.1.6.5 main
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--examples/s6-rc/mdevd/run1
-rwxr-xr-xexamples/s6/mdevd/run2
-rwxr-xr-xtools/install.sh11
3 files changed, 10 insertions, 4 deletions
diff --git a/examples/s6-rc/mdevd/run b/examples/s6-rc/mdevd/run
index e333954..acb320b 100644
--- a/examples/s6-rc/mdevd/run
+++ b/examples/s6-rc/mdevd/run
@@ -1 +1,2 @@
+#!/bin/execlineb -S0
 mdevd -D 3 -b 200000 -O4
diff --git a/examples/s6/mdevd/run b/examples/s6/mdevd/run
index 20ce23c..cdab3af 100755
--- a/examples/s6/mdevd/run
+++ b/examples/s6/mdevd/run
@@ -1,3 +1,3 @@
-#!/bin/execlineb -P
+#!/bin/execlineb -S0
 exec -c
 mdevd -D 3 -b 200000 -O4
diff --git a/tools/install.sh b/tools/install.sh
index 89f9428..e96dd7b 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,19 +1,21 @@
 #!/bin/sh
 
 usage() {
-  echo "usage: $0 [-D] [-l] [-m mode] src dst" 1>&2
+  echo "usage: $0 [ -D ] [ -l ] [ -m mode ] [ -O owner:group ] src dst" 1>&2
   exit 1
 }
 
 mkdirp=false
 symlink=false
 mode=0755
+og=
 
-while getopts Dlm: name ; do
+while getopts Dlm:O: name ; do
   case "$name" in
     D) mkdirp=true ;;
     l) symlink=true ;;
     m) mode=$OPTARG ;;
+    O) og=$OPTARG ;;
     ?) usage ;;
   esac
 done
@@ -46,7 +48,10 @@ if $symlink ; then
   ln -s "$src" "$tmp"
 else
   cat < "$1" > "$tmp"
-  chmod "$mode" "$tmp"
+  if test -n "$og" ; then
+    chown -- "$og" "$tmp"
+  fi
+  chmod -- "$mode" "$tmp"
 fi
 
 mv -f "$tmp" "$dst"