diff -urN e-smith-LPRng-2.6.0.old/createlinks e-smith-LPRng-2.6.0/createlinks --- e-smith-LPRng-2.6.0.old/createlinks 2020-11-11 11:08:42.000000000 +0400 +++ e-smith-LPRng-2.6.0/createlinks 2020-11-12 00:26:29.000000000 +0400 @@ -51,9 +51,25 @@ # actions for bootstrap-console-save event #-------------------------------------------------- -for my $event (qw(bootstrap-console-save lpd-update)) -{ - templates2events("/etc/lpd/lpd.perms", $event); - templates2events("/etc/printcap", $event); - event_link("printer-create", $event, "15") -} +my $event = "bootstrap-console-save"; + +templates2events("/etc/lpd/lpd.perms", $event); +templates2events("/etc/printcap", $event); +event_link("printer-create", $event, "15"); + +#-------------------------------------------------- +# actions for e-smith-LPRng-update event +#-------------------------------------------------- + +my $event = "e-smith-LPRng-update"; + +templates2events("/etc/lpd/lpd.perms", $event); +templates2events("/etc/printcap", $event); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lpd"); + + +# Make service statup symlinks +safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/lpd"); +# remove for systemd +#safe_symlink("/etc/rc.d/init.d/e-smith-service", "root/etc/rc.d/rc7.d/S60lpd"); +safe_symlink("/var/service/lpd", "root/service/lpd"); diff -urN e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/system/lpd.service e-smith-LPRng-2.6.0/root/usr/lib/systemd/system/lpd.service --- e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/system/lpd.service 2020-11-11 11:08:42.000000000 +0400 +++ e-smith-LPRng-2.6.0/root/usr/lib/systemd/system/lpd.service 2020-11-11 23:15:50.000000000 +0400 @@ -1,11 +1,14 @@ [Unit] -Description=lpd -#After=network.target +Description=lpd, LPRng print spool +After=network.target [Service] -Type=simple -ExecStart=/usr/lib/systemd/systemd-lpd start -ExecReload=/usr/lib/systemd/systemd-lpd reload +Type=oneshot +ExecStartPre=/sbin/e-smith/service-status lpd +ExecStart=/usr/bin/sv u /service/lpd +ExecStop=/usr/bin/sv stop /service/lpd +ExecReload=/usr/bin/sv t /service/lpd +RemainAfterExit=yes [Install] WantedBy=sme-server.target diff -urN e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/systemd-lpd e-smith-LPRng-2.6.0/root/usr/lib/systemd/systemd-lpd --- e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/systemd-lpd 2020-11-11 11:08:42.000000000 +0400 +++ e-smith-LPRng-2.6.0/root/usr/lib/systemd/systemd-lpd 1970-01-01 04:00:00.000000000 +0400 @@ -1,67 +0,0 @@ -#!/bin/sh -PREFIX=/usr -LPD_PATH="/usr/sbin/lpd" -INSTALL="/usr/bin/install -c" -LPD_PERMS_PATH="/etc/lpd/lpd.perms" -LPD_CONF_PATH="/etc/lpd/lpd.conf" -PRINTCAP_PATH="/etc/printcap" -SYSCONFDIR=/etc -DATADIR=/usr/share/LPRng -SBINDIR=/usr/sbin -FILTER_DIR=/usr/libexec/filters -LOCKFILE="/var/run/lpd" -CONFIG_SUBDIR=lpd -PSHOWALL="-ax" -VERSION=3.8.35 -INIT= -MANDIR=/usr/share/man - -#!/bin/sh -# -# lpd This shell script takes care of starting and stopping \ -# lpd (printer daemon). -# -# from /etc/rc.d/init.d/lpd -# -# description: lpd is the print daemon required for lpr to work properly. \ -# It is basically a server that arbitrates print jobs to printer(s). -# processname: ${LPD_PATH} -# config: /etc/printcap - -RETVAL=0 - -start () { - # Is this a printconf system? - if [[ -x /usr/sbin/printconf-backend ]]; then - # run printconf-backend to rebuild printcap and spools - if ! /usr/sbin/printconf-backend ; then - # If the backend fails, we dont start no printers defined - echo -n $"No Printers Defined" - fi - fi - if ! [ -e /etc/printcap ] ; then - echo -n $"No 'printcap' found" - return 1 - fi - # run checkpc to fix whatever lpd would complain about - ${SBINDIR}/checkpc -f - # start daemon - ${LPD_PATH} -F - RETVAL=$? -} - -# See how we were called. -case "$1" in - start) - start - ;; - reload) - killall ${LPD_PATH} -HUP - RETVAL=$? - ;; - *) - echo $"Usage: $0 {start|reload}" - RETVAL=1 -esac - -exit $RETVAL diff -urN e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-LPRng.preset e-smith-LPRng-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-LPRng.preset --- e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-LPRng.preset 1970-01-01 04:00:00.000000000 +0400 +++ e-smith-LPRng-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-LPRng.preset 2020-11-11 23:08:05.000000000 +0400 @@ -0,0 +1 @@ +enable lpd.service diff -urN e-smith-LPRng-2.6.0.old/root/var/service/lpd/run e-smith-LPRng-2.6.0/root/var/service/lpd/run --- e-smith-LPRng-2.6.0.old/root/var/service/lpd/run 1970-01-01 04:00:00.000000000 +0400 +++ e-smith-LPRng-2.6.0/root/var/service/lpd/run 2004-12-13 23:29:26.000000000 +0400 @@ -0,0 +1,2 @@ +#! /bin/sh +exec /usr/sbin/lpd -F