From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=altlinux.org; s=dkim; h=Subject:In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=X+Tds2Dee58MvFASXXe2xA5GPn/PZbvGH1aKQisG4mg=; b=E+RYrCCvUX7HXDUZJ9nBhbW9GZ kHsZRrgR7SZHLFcB5FjH5KH6ejoiTxKzkHEixNd5kKKxbU45XJqERw7n62+ziNwS5tO0Zthgp4QCQ 23GciSpR82jYh08/TkLYLfORBQDtk638ePHFuHlsJp0O6/tJ+TgqAjiIibDuag7nKu224qJkM7Tcm Z6DtHErtyna1k3dsK2ZelM/pjwJKudmak+jnqr7hmNnsmNgboF5Sdcqc4qYqTiEsobwH6ObKMLt+R e29SJ7GdXmoR0Lk9vwinNI0KoTUfD4H+sJ0BXt5wRI6pIzr8ZBu1W9CIWKLyXVW9Hdd+DHHLdaBDH qQsmTSFw==; Date: Thu, 22 Oct 2020 14:49:34 +0300 From: Arseny Maslennikov To: ALT Linux Team development discussions Message-ID: <20201022114934.GG1374401@cello> References: <20201022114343.1810141-1-arseny@altlinux.org> <20201022114343.1810141-5-arseny@altlinux.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="IuhbYIxU28t+Kd57" Content-Disposition: inline In-Reply-To: <20201022114343.1810141-5-arseny@altlinux.org> OpenPGP: url=http://grep.cs.msu.ru/~ar/pgp-key.asc X-SA-Exim-Connect-IP: 37.204.119.143 X-SA-Exim-Mail-From: arseny@altlinux.org X-SA-Exim-Version: 4.2.1 X-SA-Exim-Scanned: Yes (on mail.cs.msu.ru) Cc: Alexey Gladkov , ldv@altlinux.org Subject: Re: [devel] [PATCH v2 4/6] Add systemd and sysvinit service files: missing signoff X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 11:49:38 -0000 Archived-At: List-Archive: List-Post: --IuhbYIxU28t+Kd57 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 22, 2020 at 02:43:41PM +0300, Arseny Maslennikov wrote: > From: Alexey Gladkov >=20 > Signed-off-by: Alexey Gladkov Signed-off-by: Arseny Maslennikov > --- > hasher-priv/Makefile | 6 ++ > hasher-priv/hasher-priv.spec | 9 ++- > hasher-priv/hasher-privd.service | 14 ++++ > hasher-priv/hasher-privd.sysvinit | 103 ++++++++++++++++++++++++++++++ > 4 files changed, 131 insertions(+), 1 deletion(-) > create mode 100644 hasher-priv/hasher-privd.service > create mode 100755 hasher-priv/hasher-privd.sysvinit >=20 > diff --git a/hasher-priv/Makefile b/hasher-priv/Makefile > index 283249b..6e6b1e5 100644 > --- a/hasher-priv/Makefile > +++ b/hasher-priv/Makefile > @@ -14,6 +14,8 @@ MAN8PAGES =3D $(PROJECT).8 hasher-useradd.8 > TARGETS =3D $(PROJECT) hasher-privd hasher-useradd $(HELPERS) $(MAN5PAGE= S) $(MAN8PAGES) > =20 > sysconfdir =3D /etc > +initdir=3D$(sysconfdir)/rc.d/init.d > +systemd_unitdir=3D/lib/systemd/system > libexecdir =3D /usr/lib > sbindir =3D /usr/sbin > mandir =3D /usr/share/man > @@ -73,6 +75,10 @@ install: all > $(MKDIR_P) -m750 $(DESTDIR)$(helperdir) > $(INSTALL) -p -m700 $(PROJECT) $(DESTDIR)$(helperdir)/ > $(INSTALL) -p -m755 $(HELPERS) $(DESTDIR)$(helperdir)/ > + $(MKDIR_P) -m755 $(DESTDIR)$(systemd_unitdir) > + $(INSTALL) -p -m644 hasher-privd.service $(DESTDIR)$(systemd_unitdir)/ > + $(MKDIR_P) -m755 $(DESTDIR)$(initdir) > + $(INSTALL) -p -m755 hasher-privd.sysvinit $(DESTDIR)$(initdir)/hasher-p= rivd > $(MKDIR_P) -m755 $(DESTDIR)$(sbindir) > $(INSTALL) -p -m755 hasher-privd $(DESTDIR)$(sbindir)/ > $(INSTALL) -p -m755 hasher-useradd $(DESTDIR)$(sbindir)/ > diff --git a/hasher-priv/hasher-priv.spec b/hasher-priv/hasher-priv.spec > index fac25cd..c4f0e0e 100644 > --- a/hasher-priv/hasher-priv.spec > +++ b/hasher-priv/hasher-priv.spec > @@ -33,7 +33,9 @@ required by hasher utilities. > %make_build CC=3D"%__cc" CFLAGS=3D"%optflags" libexecdir=3D"%_libexecdir" > =20 > %install > -%makeinstall > +%makeinstall \ > + systemd_unitdir=3D"%{?buildroot:%{buildroot}}%_unitdir" \ > + # > =20 > %pre > if getent group pkg-build > /dev/null; then > @@ -52,10 +54,15 @@ groupadd -r -f hashman > %attr(750,root,hashman) %dir %configdir/user.d > %attr(640,root,hashman) %config(noreplace) %configdir/fstab > %attr(640,root,hashman) %config(noreplace) %configdir/system > +%attr(640,root,hashman) %config(noreplace) %configdir/server > # helpers > %attr(750,root,hashman) %dir %helperdir > %attr(6710,root,hashman) %helperdir/%name > %attr(755,root,root) %helperdir/*.sh > +# daemon > +%_sbindir/hasher-privd > +%_unitdir/hasher-privd.service > +%_initdir/hasher-privd > =20 > %doc DESIGN > =20 > diff --git a/hasher-priv/hasher-privd.service b/hasher-priv/hasher-privd.= service > new file mode 100644 > index 0000000..f44faa0 > --- /dev/null > +++ b/hasher-priv/hasher-privd.service > @@ -0,0 +1,14 @@ > +[Unit] > +Description=3DA privileged helper for the hasher project > +ConditionVirtualization=3D!container > +Documentation=3Dman:hasher-priv(8) > + > +[Service] > +ExecStart=3D/usr/sbin/hasher-privd -f > +Group=3Dhashman > +RuntimeDirectory=3Dhasher-priv > +RuntimeDirectoryMode=3D0710 > +Restart=3Don-failure > + > +[Install] > +WantedBy=3Dmulti-user.target > diff --git a/hasher-priv/hasher-privd.sysvinit b/hasher-priv/hasher-privd= =2Esysvinit > new file mode 100755 > index 0000000..263c9f7 > --- /dev/null > +++ b/hasher-priv/hasher-privd.sysvinit > @@ -0,0 +1,103 @@ > +#! /bin/sh > + > +### BEGIN INIT INFO > +# Short-Description: A privileged helper for the hasher project > +# Description: A privileged helper for the hasher project > +# Provides: hasher-priv > +# Required-Start: $remote_fs > +# Required-Stop: $remote_fs > +# Default-Start: 2 3 4 5 > +# Default-Stop: 0 1 6 > +### END INIT INFO > + > +WITHOUT_RC_COMPAT=3D1 > + > +# Source function library. > +. /etc/init.d/functions > + > +NAME=3Dhasher-privd > +PIDFILE=3D"/var/run/$NAME.pid" > +LOCKFILE=3D"/var/lock/subsys/$NAME" > +RUNTIMEDIR=3D"/run/hasher-priv" > +RUNTIMEDIRMODE=3D"0710" > +GROUP=3Dhashman > +RETVAL=3D0 > + > +ensure_runtime_directory() > +{ > + mkdir -p "$RUNTIMEDIR" > + chmod 0710 "$RUNTIMEDIR" > + chgrp "$GROUP" "$RUNTIMEDIR" > +} > + > +ensure_no_runtime_directory() > +{ > + rm -rf "$RUNTIMEDIR" > +} > + > +start() > +{ > + start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- "$NAME" > + RETVAL=3D$? > + return $RETVAL > +} > + > +stop() > +{ > + stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" "$NAME" > + RETVAL=3D$? > + return $RETVAL > +} > + > +restart() > +{ > + stop > + start > +} > + > +# See how we were called. > +case "$1" in > + start) > + ensure_runtime_directory > + start > + ;; > + stop) > + stop > + ensure_no_runtime_directory > + ;; > + status) > + status --pidfile "$PIDFILE" "$NAME" > + RETVAL=3D$? > + ;; > + restart) > + restart > + ;; > + reload) > + restart > + ;; > + condstart) > + if [ ! -e "$LOCKFILE" ]; then > + start > + fi > + ;; > + condstop) > + if [ -e "$LOCKFILE" ]; then > + stop > + fi > + ;; > + condrestart) > + if [ -e "$LOCKFILE" ]; then > + restart > + fi > + ;; > + condreload) > + if [ -e "$LOCKFILE" ]; then > + reload > + fi > + ;; > + *) > + msg_usage "${0##*/} {start|stop|status|restart|reload|condstart|condst= op|condrestart|condreload}" > + RETVAL=3D1 > +esac > + > +exit $RETVAL > --=20 > 2.25.4 >=20 > _______________________________________________ > Devel mailing list > Devel@lists.altlinux.org > https://lists.altlinux.org/mailman/listinfo/devel --IuhbYIxU28t+Kd57 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE56JD3UKTLEu/ddrm9dQjyAYL01AFAl+RccMACgkQ9dQjyAYL 01BhxBAAh7RXqlp4kEnF/DI2eSVVMbMieE2BH2uoKql5iK3LnvpnpAAy5BxKWs8f Kg2/zURlHp9hPnR2G1oC+FZ2Ps0Be05ROswOoWV/bahyza8nZNAufDHm/QUkrRMr /oNNJFU6YGHrcNimHAJOHKLNR/qvDwyVpBZMggaXRdaw1G5MqZC887b5kE8UyWjC yCwnEveKN/3iO6b+Z2ECnxI8K24r5NNTut6rSSmDHjY/YQRx9PQwMDFTA5HDvxNF 3MGheb9H3wXRHAhgqeqT0xm5dgkV49zT4nVDXEdcJUs9uH5bl4p02gBytOdxcqXL OMjkq7C0tHCAXAX4x2XagGs/FjR9qg0Hqfar+v3kdPY1xZyvNxF1WIoLEippe2k9 Gjxb+41cnvrt3HJYAaILmRM6/nVyG1dNGZkkGHmqX3mu7qJIXZnQaBDD9ELhIuvy i+xu9RIqZpih1cblAGyYYWA6jA86rt1u/nmWvca2bp78G8Q4d5WEdijzE16tbYt6 igZKoxre2m43WR6I6RQaKJXoEb9i9qiQvZ05FlG4OKxSulnlUxksNBl7IRyPzEcq GD8v9GHKFRFIrG05Hq1pm5iXafZmTliEbdKEGJxm0itmnDWrQaNf5XgoqEZpvjQT lkT4npbkeVx0EEs3ZCMgf5NSdk2X3dCp4JtIqAtU9ExXZjmHudM= =uu7t -----END PGP SIGNATURE----- --IuhbYIxU28t+Kd57--