summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--nldev.confd4
-rw-r--r--nldev.initd11
-rw-r--r--nltrigger.initd2
5 files changed, 15 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecbf18a3d4ba..73c974a37548 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nldev-openrc
pkgdesc = OpenRC nldev and nltrigger init scripts
- pkgver = 20210828
+ pkgver = 20210913
pkgrel = 1
arch = any
license = MIT/X
@@ -9,8 +9,8 @@ pkgbase = nldev-openrc
source = nldev.confd
source = nldev.initd
source = nltrigger.initd
- sha256sums = 210bf319a575bac663f3926f832d296cd13747c31e2c2d575808d1fa773e7a87
- sha256sums = 36aa42fab2fd3eca41fe740d85f7b517ceace57f1cef4c67cde427e9d0ed6a2f
- sha256sums = 766bb955aad9289b87eccb5ab1c4f82815288ac209c0a7454374fdcda547d088
+ sha256sums = 68f14d734172bdb16607a849d2ce8b42828fd2c0ebaf324e8ca05263d5abdf3e
+ sha256sums = 1d80f70281c1c176a5271566b8fba7071cae2ce972cefcf607c457883cd97bc8
+ sha256sums = e2446bb7592c528fc4b2d695f48ff78213a75b6ed76b78e332ca2f82aae11064
pkgname = nldev-openrc
diff --git a/PKGBUILD b/PKGBUILD
index 44054ff6fcf2..7105f2c4eacd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Platon Ryzhikov <ihummer63@yandex.ru>
pkgname=nldev-openrc
-pkgver=20210828
+pkgver=20210913
pkgrel=1
pkgdesc="OpenRC nldev and nltrigger init scripts"
arch=('any')
@@ -10,9 +10,9 @@ depends=('nldev' 'openrc')
source=("nldev.confd"
"nldev.initd"
"nltrigger.initd")
-sha256sums=('210bf319a575bac663f3926f832d296cd13747c31e2c2d575808d1fa773e7a87'
- '36aa42fab2fd3eca41fe740d85f7b517ceace57f1cef4c67cde427e9d0ed6a2f'
- '766bb955aad9289b87eccb5ab1c4f82815288ac209c0a7454374fdcda547d088')
+sha256sums=('68f14d734172bdb16607a849d2ce8b42828fd2c0ebaf324e8ca05263d5abdf3e'
+ '1d80f70281c1c176a5271566b8fba7071cae2ce972cefcf607c457883cd97bc8'
+ 'e2446bb7592c528fc4b2d695f48ff78213a75b6ed76b78e332ca2f82aae11064')
package() {
install -Dm755 ${srcdir}/nldev.initd ${pkgdir}/etc/init.d/nldev
diff --git a/nldev.confd b/nldev.confd
index decfb48aaa28..fe91eb110cb3 100644
--- a/nldev.confd
+++ b/nldev.confd
@@ -1,7 +1,7 @@
# /etc/conf.d/nldev: config file for nldev
# choose hotplug helper
-runpath="/usr/bin/smdev"
+# runpath="/usr/bin/smdev"
# Add extra command line options to nldev
-# nldev_opts=""
+# nldev_opts="-r ${runpath}"
diff --git a/nldev.initd b/nldev.initd
index 93a05e20a810..1e1d88e325f9 100644
--- a/nldev.initd
+++ b/nldev.initd
@@ -1,6 +1,10 @@
#!/usr/bin/openrc-run
description="nldev is a simple netlink device manager"
+command=/usr/bin/nldev
+supervisor="supervise-daemon"
+command_args="-k ${nldev_opts}"
+name="NetLink DEVice manager"
depend()
{
@@ -8,10 +12,3 @@ depend()
before checkfs fsck nltrigger
provide dev
}
-
-start()
-{
- ebegin "Starting nldev device manager"
- nldev -b -r "${runpath}" "${nldev_opts}"
- eend $?
-}
diff --git a/nltrigger.initd b/nltrigger.initd
index 6ad360d9b8fe..75f49aa7e28d 100644
--- a/nltrigger.initd
+++ b/nltrigger.initd
@@ -11,7 +11,7 @@ depend()
start()
{
ebegin "Triggering device uevents"
- nltrigger add all
+ nltrigger /sys add 0
sleep 1s
eend $?
}