/[smeserver]/rpms/e-smith-LPRng/sme10/e-smith-LPRng-2.6.0-bz11006_systemd.patch
ViewVC logotype

Annotation of /rpms/e-smith-LPRng/sme10/e-smith-LPRng-2.6.0-bz11006_systemd.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Sep 22 10:04:13 2020 UTC (4 years, 1 month ago) by michel
Branch: MAIN
CVS Tags: e-smith-LPRng-2_6_0-4_el7_sme, e-smith-LPRng-2_6_0-7_el7_sme, e-smith-LPRng-2_6_0-3_el7_sme, e-smith-LPRng-2_6_0-6_el7_sme, e-smith-LPRng-2_6_0-9_el7_sme, e-smith-LPRng-2_6_0-5_el7_sme, e-smith-LPRng-2_6_0-8_el7_sme, HEAD 
* Sat Sep 05 2020 Michel Begue <mab974@gmail.com> 2.6.0-3.sme
- from service to systemd [SME: 11006]
- add lpd-update event [SME: 11007]
1 michel 1.1 diff -urN e-smith-LPRng-2.6.0.old/createlinks e-smith-LPRng-2.6.0/createlinks
2     --- e-smith-LPRng-2.6.0.old/createlinks 2008-10-07 21:36:14.000000000 +0400
3     +++ e-smith-LPRng-2.6.0/createlinks 2020-09-21 17:08:36.757000000 +0400
4     @@ -17,7 +17,7 @@
5    
6     event_link("printer-create", $event, "15");
7     templates2events("/etc/printcap", $event);
8     -safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/lpd");
9     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lpd");
10    
11     #--------------------------------------------------
12     # actions for printer-delete event
13     @@ -27,7 +27,7 @@
14    
15     event_link("printer-delete", $event, "15");
16     templates2events("/etc/printcap", $event);
17     -safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/lpd");
18     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lpd");
19    
20     #--------------------------------------------------
21     # actions for network-create event
22     @@ -36,7 +36,7 @@
23     $event = "network-create";
24    
25     templates2events("/etc/lpd/lpd.perms", $event);
26     -safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/lpd");
27     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lpd");
28    
29     #--------------------------------------------------
30     # actions for network-delete event
31     @@ -45,19 +45,15 @@
32     $event = "network-delete";
33    
34     templates2events("/etc/lpd/lpd.perms", $event);
35     -safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/lpd");
36     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/lpd");
37    
38     #--------------------------------------------------
39     # actions for bootstrap-console-save event
40     #--------------------------------------------------
41    
42     -$event = "bootstrap-console-save";
43     -
44     -templates2events("/etc/lpd/lpd.perms", $event);
45     -templates2events("/etc/printcap", $event);
46     -event_link("printer-create", $event, "15");
47     -
48     -# Make service statup symlinks
49     -safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/lpd");
50     -safe_symlink("/etc/rc.d/init.d/e-smith-service", "root/etc/rc.d/rc7.d/S60lpd");
51     -safe_symlink("/var/service/lpd", "root/service/lpd");
52     +for my $event (qw(bootstrap-console-save lpd-update))
53     +{
54     + templates2events("/etc/lpd/lpd.perms", $event);
55     + templates2events("/etc/printcap", $event);
56     + event_link("printer-create", $event, "15")
57     +}
58     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
59     --- e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/system/lpd.service 1970-01-01 04:00:00.000000000 +0400
60     +++ e-smith-LPRng-2.6.0/root/usr/lib/systemd/system/lpd.service 2020-09-04 18:57:48.000000000 +0400
61     @@ -0,0 +1,11 @@
62     +[Unit]
63     +Description=lpd
64     +#After=network.target
65     +
66     +[Service]
67     +Type=simple
68     +ExecStart=/usr/lib/systemd/systemd-lpd start
69     +ExecReload=/usr/lib/systemd/systemd-lpd reload
70     +
71     +[Install]
72     +WantedBy=sme-server.target
73     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
74     --- e-smith-LPRng-2.6.0.old/root/usr/lib/systemd/systemd-lpd 1970-01-01 04:00:00.000000000 +0400
75     +++ e-smith-LPRng-2.6.0/root/usr/lib/systemd/systemd-lpd 2020-09-04 19:15:54.000000000 +0400
76     @@ -0,0 +1,67 @@
77     +#!/bin/sh
78     +PREFIX=/usr
79     +LPD_PATH="/usr/sbin/lpd"
80     +INSTALL="/usr/bin/install -c"
81     +LPD_PERMS_PATH="/etc/lpd/lpd.perms"
82     +LPD_CONF_PATH="/etc/lpd/lpd.conf"
83     +PRINTCAP_PATH="/etc/printcap"
84     +SYSCONFDIR=/etc
85     +DATADIR=/usr/share/LPRng
86     +SBINDIR=/usr/sbin
87     +FILTER_DIR=/usr/libexec/filters
88     +LOCKFILE="/var/run/lpd"
89     +CONFIG_SUBDIR=lpd
90     +PSHOWALL="-ax"
91     +VERSION=3.8.35
92     +INIT=
93     +MANDIR=/usr/share/man
94     +
95     +#!/bin/sh
96     +#
97     +# lpd This shell script takes care of starting and stopping \
98     +# lpd (printer daemon).
99     +#
100     +# from /etc/rc.d/init.d/lpd
101     +#
102     +# description: lpd is the print daemon required for lpr to work properly. \
103     +# It is basically a server that arbitrates print jobs to printer(s).
104     +# processname: ${LPD_PATH}
105     +# config: /etc/printcap
106     +
107     +RETVAL=0
108     +
109     +start () {
110     + # Is this a printconf system?
111     + if [[ -x /usr/sbin/printconf-backend ]]; then
112     + # run printconf-backend to rebuild printcap and spools
113     + if ! /usr/sbin/printconf-backend ; then
114     + # If the backend fails, we dont start no printers defined
115     + echo -n $"No Printers Defined"
116     + fi
117     + fi
118     + if ! [ -e /etc/printcap ] ; then
119     + echo -n $"No 'printcap' found"
120     + return 1
121     + fi
122     + # run checkpc to fix whatever lpd would complain about
123     + ${SBINDIR}/checkpc -f
124     + # start daemon
125     + ${LPD_PATH} -F
126     + RETVAL=$?
127     +}
128     +
129     +# See how we were called.
130     +case "$1" in
131     + start)
132     + start
133     + ;;
134     + reload)
135     + killall ${LPD_PATH} -HUP
136     + RETVAL=$?
137     + ;;
138     + *)
139     + echo $"Usage: $0 {start|reload}"
140     + RETVAL=1
141     +esac
142     +
143     +exit $RETVAL
144     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
145     --- e-smith-LPRng-2.6.0.old/root/var/service/lpd/run 2004-12-13 23:29:26.000000000 +0400
146     +++ e-smith-LPRng-2.6.0/root/var/service/lpd/run 1970-01-01 04:00:00.000000000 +0400
147     @@ -1,2 +0,0 @@
148     -#! /bin/sh
149     -exec /usr/sbin/lpd -F
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed