From 777ab3ba81cecfd8ba31e1681cdb4906b988623b Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 20 Feb 2019 13:34:47 -0800 Subject: Swap to /usr/bin and /run paths No longer backup sh --- PKGBUILD | 10 ++++------ rngd-neug.sh | 2 +- rngd.initd | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 9ed6e2a..aa19077 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: jc_gargma # # I maintain this because: +# Artix version uses /sbin # rng-tools-openrc requires significant modifications for neug _pkgname=rng-tools @@ -8,7 +9,7 @@ _exname=rngd _exexname=${_exname}-neug pkgname=${_pkgname}-openrc-neug pkgver=20190220 -pkgrel=2 +pkgrel=4 pkgdesc="OpenRC ${_pkgname} init script for neug" arch=('any') url="https://neueland.iserlohn-fortress.net/gitea/jc_gargma" @@ -16,15 +17,12 @@ license=('GPL2') groups=('openrc-galaxy') depends=('openrc' "${_pkgname}") conflicts=("${_pkgname}-openrc") -backup=( - "etc/${_exexname}.sh" - ) source=( "${_exname}.initd" "${_exexname}.sh" ) -sha256sums=('8410856e43ccc5eac78651a2ff6bdbb910c009effc3f694217cfa41672e6bb1c' - '0543670855e1c6181d96cdbaa69b2b462f71f88ff260defe54e91c65e7227d7e') +sha256sums=('9784966d56e19f8c68f9443b9ee6538c41e9cea6f7128a3fbf56fbd62c6f9fd0' + '484faa4939b765e8960a3e79b1b357bc25c51bf1f6f40235a224fd79a8f64826') package() { install -Dm755 ${srcdir}/${_exname}.initd ${pkgdir}/etc/init.d/${_exname} diff --git a/rngd-neug.sh b/rngd-neug.sh index 38bdb2c..07954dc 100644 --- a/rngd-neug.sh +++ b/rngd-neug.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/sh stty -F /dev/ttyACM0 raw -echo -parenb /usr/bin/rngd --fill-watermark=3680 --exclude=tpm --exclude=rdrand --exclude=nist --exclude=jitter --exclude=pkcs11 --rng-device=/dev/ttyACM0 diff --git a/rngd.initd b/rngd.initd index cb342b1..a111629 100644 --- a/rngd.initd +++ b/rngd.initd @@ -1,4 +1,4 @@ -#!/sbin/openrc-run +#!/usr/bin/openrc-run # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 @@ -9,6 +9,6 @@ depend() { } command=/etc/rngd-neug.sh -pidfile="/var/run/${SVCNAME}.pid" +pidfile="/run/${SVCNAME}.pid" start_stop_daemon_args="--wait 1000" retry="SIGKILL/5000" -- cgit v1.2.1