From 739c65c54cb0e957df5e9b76f93fb02554e5cac3 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:52:30 +0100 Subject: moved everything to new file formatting --- extra/wpa_supplicant/wpa_cli.confd | 1 - extra/wpa_supplicant/wpa_cli.initd | 22 --------- extra/wpa_supplicant/wpa_supplicant.confd | 10 ---- extra/wpa_supplicant/wpa_supplicant.initd | 79 ------------------------------- 4 files changed, 112 deletions(-) delete mode 100644 extra/wpa_supplicant/wpa_cli.confd delete mode 100644 extra/wpa_supplicant/wpa_cli.initd delete mode 100644 extra/wpa_supplicant/wpa_supplicant.confd delete mode 100644 extra/wpa_supplicant/wpa_supplicant.initd (limited to 'extra/wpa_supplicant') diff --git a/extra/wpa_supplicant/wpa_cli.confd b/extra/wpa_supplicant/wpa_cli.confd deleted file mode 100644 index aa481ac..0000000 --- a/extra/wpa_supplicant/wpa_cli.confd +++ /dev/null @@ -1 +0,0 @@ -WPACLI_OPTS="-a /etc/wpa_supplicant/wpa_cli.sh" diff --git a/extra/wpa_supplicant/wpa_cli.initd b/extra/wpa_supplicant/wpa_cli.initd deleted file mode 100644 index 2bf7c0d..0000000 --- a/extra/wpa_supplicant/wpa_cli.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run - -supervisor=supervise-daemon - -# The wpa_cli services depends on wpa_supplicant. If wpa_supplicant is -# restarted, so is wpa_cli. Unfortunately, wpa_supplicant creates the -# socket, used for communication with wpa_cli, rather late thereby -# causing wpa_cli to be restarted before it is created and thus fail. -# By default supervise-daemon will restart wpa_cli immediately, often -# resulting in all restart attempts to be exhausted before the socket is -# created. To work around this issue, add a respawn-delay to wpa_cli. -supervise_daemon_args="--respawn-delay 3" - -name="WPA Command Line Client" -description="Text-based frontend for interacting with WPA Supplicant" - -command=/sbin/wpa_cli -command_args="${WPACLI_OPTS} >/dev/null" - -depend() { - need wpa_supplicant -} diff --git a/extra/wpa_supplicant/wpa_supplicant.confd b/extra/wpa_supplicant/wpa_supplicant.confd deleted file mode 100644 index 56a6c11..0000000 --- a/extra/wpa_supplicant/wpa_supplicant.confd +++ /dev/null @@ -1,10 +0,0 @@ -# conf.d file for wpa_supplicant -# -# Please check man 8 wpa_supplicant for more information about the options -# wpa_supplicant accepts. -wpa_supplicant_args="" - -# The dbus interface will be enabled by default if wpa_supplicant.conf is -# missing. use wpa_supplicant_dbus to explicitly enable/disable dbus interface - -#wpa_supplicant_dbus=no diff --git a/extra/wpa_supplicant/wpa_supplicant.initd b/extra/wpa_supplicant/wpa_supplicant.initd deleted file mode 100644 index c1a4834..0000000 --- a/extra/wpa_supplicant/wpa_supplicant.initd +++ /dev/null @@ -1,79 +0,0 @@ -#!/sbin/openrc-run -# Copyright (c) 2009 Roy Marples -# All rights reserved. Released under the 2-clause BSD license. -supervisor=supervise-daemon - -name="WPA Supplicant" -description="Wi-Fi Protected Access client and IEEE 802.1X supplicant" - -command=/sbin/wpa_supplicant -wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if -command_args="$wpa_supplicant_args $wpa_supplicant_if" - -default_conf=/etc/wpa_supplicant/wpa_supplicant.conf - -depend() { - need localmount - use logger dbus - after bootmisc modules entropy udev-settle - before dns dhcpcd net - keyword -shutdown -} - -find_wireless() { - local iface= - for iface in /sys/class/net/*; do - if [ -e "$iface"/wireless -o -e "$iface"/phy80211 ]; then - echo "${iface##*/}" - return 0 - fi - done - - return 1 -} - -append_wireless() { - local iface= i= - - iface=$(find_wireless) - if [ -n "$iface" ]; then - for i in $iface; do - command_args="$command_args -i$i" - done - else - eerror "Could not find a wireless interface" - fi -} - -start_pre() { - case " $command_args" in - *" -i"*) ;; - *) append_wireless;; - esac - - # set default conf if dbus is explicitly disabled - if [ -n "${wpa_supplicant_dbus}" ] && ! yesno "${wpa_supplicant_dbus}"; then - : ${wpa_supplicant_conf:=${default_conf}} - fi - - # use default conf if it exists - if [ -f "${default_conf}" ]; then - : ${wpa_supplicant_conf:=${default_conf}} - fi - - # enable default dbus if we still dont have a config - if [ -z "${wpa_supplicant_conf}" ]; then - : ${wpa_supplicant_dbus:=yes} - else - command_args="${command_args} -c$wpa_supplicant_conf" - fi - case " ${command_args}" in - *" -u"*);; - *) if yesno "{wpa_supplicant_dbus}"; then - command_args="-u ${command_args}" - fi - ;; - esac - - checkpath -d -m 0755 -o root:root /var/run/wpa_supplicant -} -- cgit v1.2.1