fix: opensuse: tests: no longer rely on sysV scripts

master
Stéphane Lesimple 1 month ago committed by Stéphane Lesimple
parent 36850d6a05
commit a728c2f760

@ -124,7 +124,7 @@ elif echo "$DISTRO_LIKE" | grep -q -w suse; then
perl-JSON-XS inotify-tools lsof curl perl-TermReadLine-Gnu \
perl-libwww-perl perl-Digest perl-IO-Socket-SSL \
perl-Net-Server cryptsetup mosh expect openssh \
coreutils bash perl-CGI iputils \
coreutils bash perl-CGI iputils util-linux-systemd \
perl-Time-HiRes perl-Unix-Syslog hostname perl-LWP-Protocol-https \
google-authenticator-libpam tar perl-Test-Deep"
[ "$opt_syslogng" = 1 ] && wanted_list="$wanted_list syslog-ng"

@ -171,7 +171,7 @@ if [ "$WANT_HTTP_PROXY" = 1 ]; then
echo "Starting HTTP Proxy and fake remote server"
while : ; do
if ! pgrep -f /osh-http-proxy-daemon >/dev/null; then
if [ -x /etc/init.d/osh-http-proxy ]; then
if [ -x /etc/init.d/osh-http-proxy ] && [ -f /lib/init/vars.sh ] && command -v start-stop-daemon >/dev/null 2>&1; then
/etc/init.d/osh-http-proxy start
else
sudo -n -u proxyhttp -- /opt/bastion/bin/proxy/osh-http-proxy-daemon &

Loading…
Cancel
Save