pyrox.dev
service-wrapper: 16.04.0 -> 19.04
+2
-1
pkgs/os-specific/linux/service-wrapper/default.nix
+2
-1
pkgs/os-specific/linux/service-wrapper/default.nix
···
2
2
3
3
let
4
4
name = "service-wrapper-${version}";
5
-
version = "16.04.0"; # Ajar to Ubuntu Release
5
+
version = "19.04"; # Akin to Ubuntu Release
6
6
in
7
7
runCommand "${name}" {
8
8
script = substituteAll {
···
17
17
license = licenses.gpl2Plus;
18
18
platforms = platforms.linux;
19
19
maintainers = with maintainers; [ DerTim1 ];
20
+
# Shellscript has been modified but upstream source is: https://git.launchpad.net/ubuntu/+source/init-system-helpers
20
21
};
21
22
}
22
23
''
+3
-26
pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
+3
-26
pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
···
41
41
return 1
42
42
}
43
43
44
-
VERSION=$(@coreutils@/bin/basename $0)" ver. 0.91-ubuntu1"
44
+
VERSION=$(@coreutils@/bin/basename $0)" ver. 19-04"
45
45
USAGE="Usage: "$(@coreutils@/bin/basename $0)" < option > | --status-all | \
46
46
[ service_name [ command | --full-restart ] ]"
47
47
SERVICE=
···
133
133
esac
134
134
done
135
135
136
-
# Operate against system upstart, not session
137
-
unset UPSTART_SESSION
138
-
if [ -r "/etc/init/${SERVICE}.conf" ] && which initctl >/dev/null \
139
-
&& initctl version 2>/dev/null | grep -q upstart \
140
-
&& initctl status ${SERVICE} 2>/dev/null 1>/dev/null
141
-
then
142
-
# Upstart configuration exists for this job and we're running on upstart
143
-
case "${ACTION}" in
144
-
start|stop|status|reload)
145
-
# Action is a valid upstart action
146
-
exec ${ACTION} ${SERVICE} ${OPTIONS}
147
-
;;
148
-
restart|force-reload)
149
-
# Map restart to the usual sysvinit behavior.
150
-
# Map force-reload to restart as per Debian policy 9.3.2,
151
-
# since there is no way to know if "reload" is supported
152
-
stop ${SERVICE} ${OPTIONS} || :
153
-
exec start ${SERVICE} ${OPTIONS}
154
-
;;
155
-
esac
156
-
fi
157
-
158
-
159
136
run_via_sysvinit() {
160
137
# Otherwise, use the traditional sysvinit
161
138
if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
···
198
175
fi
199
176
200
177
case "${ACTION}" in
201
-
restart|status)
178
+
restart|status|try-restart)
202
179
exec systemctl $sctl_args ${ACTION} ${UNIT}
203
180
;;
204
181
start|stop)
···
214
191
exec systemctl $sctl_args ${ACTION} ${UNIT}
215
192
;;
216
193
reload)
217
-
_canreload="$(SYSTEMCTL -p CanReload show ${UNIT} 2>/dev/null)"
194
+
_canreload="$(systemctl -p CanReload show ${UNIT} 2>/dev/null)"
218
195
if [ "$_canreload" = "CanReload=no" ]; then
219
196
# The reload action falls back to the sysv init script just in case
220
197
# the systemd service file does not (yet) support reload for a