diff options
| -rw-r--r-- | system/daemontools/daemontools.SlackBuild | 5 | ||||
| -rw-r--r-- | system/daemontools/doinst.sh | 3 | ||||
| -rw-r--r-- | system/daemontools/doinst_sh | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/system/daemontools/daemontools.SlackBuild b/system/daemontools/daemontools.SlackBuild index 0905e3ca15..6bba35bb9e 100644 --- a/system/daemontools/daemontools.SlackBuild +++ b/system/daemontools/daemontools.SlackBuild @@ -23,7 +23,7 @@ PRGNAM=daemontools VERSION=${VERSION:-0.76} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -107,10 +107,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# doinst* is only needed if EDIT_INITTAB is enabled +# doinst.sh is only needed if EDIT_INITTAB is enabled if [ "$EDIT_INITTAB" != no ]; then cat $CWD/doinst.sh > $PKG/install/doinst.sh - cat $CWD/doinst_sh > $PKG/install/doinst_sh else # No doinst, so put /service into the package mkdir $PKG/service diff --git a/system/daemontools/doinst.sh b/system/daemontools/doinst.sh index e263470fc2..dfd9d1475e 100644 --- a/system/daemontools/doinst.sh +++ b/system/daemontools/doinst.sh @@ -1,2 +1 @@ -chroot . /bin/sh /install/doinst_sh -rm install/doinst_sh +chroot . sh -c "cd /package/admin/daemontools;./package/run" diff --git a/system/daemontools/doinst_sh b/system/daemontools/doinst_sh deleted file mode 100644 index 7713fa30ff..0000000000 --- a/system/daemontools/doinst_sh +++ /dev/null @@ -1,2 +0,0 @@ -cd /package/admin/daemontools -./package/run |