On Thu, Sep 17, 2020 at 04:10:52PM +0300, Arseny Maslennikov wrote:
> On Fri, Dec 13, 2019 at 12:42:04PM +0100, Alex Gladkov wrote:
> > From: Alexey Gladkov <legion@altlinux.org>
> > 
> > Signed-off-by: Alexey Gladkov <legion@altlinux.org>
> > ---
> >  hasher-priv/Makefile              |  4 ++
> >  hasher-priv/hasher-privd.service  | 11 ++++
> >  hasher-priv/hasher-privd.sysvinit | 86 +++++++++++++++++++++++++++++++
> >  3 files changed, 101 insertions(+)
> >  create mode 100644 hasher-priv/hasher-privd.service
> >  create mode 100755 hasher-priv/hasher-privd.sysvinit
> > 
> > diff --git a/hasher-priv/Makefile b/hasher-priv/Makefile
> > index 82aa385..c73216f 100644
> > --- a/hasher-priv/Makefile
> > +++ b/hasher-priv/Makefile
> > @@ -14,6 +14,8 @@ MAN8PAGES = $(PROJECT).8 hasher-useradd.8
> >  TARGETS = $(PROJECT) hasher-privd hasher-useradd $(HELPERS) $(MAN5PAGES) $(MAN8PAGES)
> >  
> >  sysconfdir = /etc
> > +initdir=$(sysconfdir)/rc.d/init.d
> > +systemd_unitdir=/lib/systemd/system
> >  libexecdir = /usr/lib
> >  sbindir = /usr/sbin
> >  mandir = /usr/share/man
> > @@ -72,6 +74,8 @@ install: all
> >  	$(MKDIR_P) -m750 $(DESTDIR)$(helperdir)
> >  	$(INSTALL) -p -m700 $(PROJECT) $(DESTDIR)$(helperdir)/
> >  	$(INSTALL) -p -m755 $(HELPERS) $(DESTDIR)$(helperdir)/
> > +	$(MKDIR_P) -m755 $(DESTDIR)$(initdir)
> > +	$(INSTALL) -p -m755 hasher-privd.sysvinit $(DESTDIR)$(initdir)/hasher-privd
> 
> The systemd service is not installed.

I don't really care about systemd. I'm not an expert in creating services
for it. I hope that someone who can create and test the service. It may be
you :)

> >  	$(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-privd.service b/hasher-priv/hasher-privd.service
> > new file mode 100644
> > index 0000000..e5ed9ac
> > --- /dev/null
> > +++ b/hasher-priv/hasher-privd.service
> > @@ -0,0 +1,11 @@
> > +[Unit]
> > +Description=A privileged helper for the hasher project
> > +ConditionVirtualization=!container
> 
> In response to earlier reviewers: hasher-priv as of today does not work
> inside a userns-unprivileged container and does not produce clear
> diagnostics (and, from my own experience when I was joining ALT, the
> developers did not as well). Thus, for now this condition is justified.
> Perhaps in the future, when (and if) we introduce the ability to reuse a
> mainstream container runtime as the hasher environment for users R and
> B, it would make sense for us to lift this condition.
> 
> > +Documentation=man:hasher-priv(8)
> 
> Ah yes, I forgot. The patchset contains no changes to the man pages, so
> the effort and behaviour change is not reflected. I agree it's best to
> revisit them once we're done with the code, though.
> 
> > +
> > +[Service]
> > +ExecStart=/usr/sbin/hasher-privd
> 
> Suggested replacement:
> "ExecStart=/usr/sbin/hasher-privd -f"
> 
> The service implicitly, by default, has Type=simple, which means the
> following:
> - the main process(-es) is defined by the ExecStart= command line(-s)
>   and is intended to persist while the service is launched and active;
> - its pid/tgid is tracked by the service manager and can be queried;
> - the service manager puts it into its own cgroup;
> - its standard output and standard error are redirected to system log;
> - (follows from the above) the main process never has a controlling
>   terminal or standard file descriptors pointing to any terminal, its
>   sid is equal to its tgid — and so it does not have to perform
>   manual steps to daemonize.
> 
> > +Restart=on-failure
> > +
> > +[Install]
> > +WantedBy=multi-user.target
> > diff --git a/hasher-priv/hasher-privd.sysvinit b/hasher-priv/hasher-privd.sysvinit
> > new file mode 100755
> > index 0000000..914fb53
> > --- /dev/null
> > +++ b/hasher-priv/hasher-privd.sysvinit
> > @@ -0,0 +1,86 @@
> > +#! /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=1
> > +
> > +# Source function library.
> > +. /etc/init.d/functions
> > +
> > +NAME=hasher-privd
> > +PIDFILE="/var/run/$NAME.pid"
> > +LOCKFILE="/var/lock/subsys/$NAME"
> > +RETVAL=0
> > +
> > +start()
> > +{
> > +	start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- "$NAME"
> > +	RETVAL=$?
> > +	return $RETVAL
> > +}
> > +
> > +stop()
> > +{
> > +	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" "$NAME"
> > +	RETVAL=$?
> > +	return $RETVAL
> > +}
> > +
> > +restart()
> > +{
> > +	stop
> > +	start
> > +}
> > +
> > +# See how we were called.
> > +case "$1" in
> > +	start)
> > +		start
> > +		;;
> > +	stop)
> > +		stop
> > +		;;
> > +	status)
> > +		status --pidfile "$PIDFILE" "$NAME"
> > +		RETVAL=$?
> > +		;;
> > +	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|condstop|condrestart|condreload}"
> > +		RETVAL=1
> > +esac
> > +
> > +exit $RETVAL
> > -- 
> > 2.24.0
> > 



-- 
Rgrds, legion