summaryrefslogtreecommitdiffstats
path: root/source/n/wireless_tools/scripts/rc.wireless
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-03-18 23:54:14 +0000
committer Eric Hameleers <alien@slackware.com>2021-03-19 08:59:51 +0100
commitda4119a5e08aaa161e577324030abde7a21a2b81 (patch)
tree9028fe8c2b687c14bba95261a8cc6d3582a79ec7 /source/n/wireless_tools/scripts/rc.wireless
parent1b9db3bbdd03829675039f602457316463410699 (diff)
downloadcurrent-da4119a5e08aaa161e577324030abde7a21a2b81.tar.gz
current-da4119a5e08aaa161e577324030abde7a21a2b81.tar.xz
Thu Mar 18 23:54:14 UTC 202120210318235414
ap/slackpkg-15.0.1-noarch-1.txz: Upgraded. Tweak default blacklist file's help text (thanks, dive). Fix display of blacklisted packages. Tweaks to slack-desc. Note that kernel-headers should not be blacklisted. Added Lithuania mirrors (Totoro-kun on LQ). Fix exit code for pending updates (dive). Avoid matching txz/tgz etc extension when blacklisting (dive). Use https for all slackpkg homepage links. Update mirror files (14.2 -> 15.0). Add blacklist to search option. Move applyblacklist to end of makelist(). Clarify how to blacklist duplicate packages. Fix new-config dialog. Reduce false positives in DOUBLEFILES detection. Remove spaces in awk.. More blacklisting fixups (see full commit msg). Escape plus signs in blacklist regex. Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive). Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive). Further fixup/enhancement to blacklisting issues. Fix "slackpkg blacklist" so that it shows blacklist again. Fixup internal blacklist handling. Use ERE for sanity_check() function (David Woodfall). Remove "slackpkg blacklist" from manual pages. Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes). Split aarch64 and arm mirrors into separate files (mozes). Allow new-config after slackpkg upgrade itself (PiterPUNK). Modify blacklist regex line ending. Thanks to Robby Workman. ap/sqlite-3.35.2-x86_64-1.txz: Upgraded. kde/kid3-3.8.6-x86_64-1.txz: Upgraded. l/glib2-2.66.8-x86_64-1.txz: Upgraded. l/pango-1.48.3-x86_64-2.txz: Rebuilt. Eliminate dangling symlink. Thanks to upnort. n/bind-9.16.13-x86_64-1.txz: Upgraded. n/links-2.22-x86_64-1.txz: Upgraded. n/network-scripts-15.0-noarch-14.txz: Rebuilt. Fix discrepancies between rc.inet1.conf versions. Move configuration of SLACC before DHCP. Don't bring up a bridge interface if it will be brought up later by IP config. Fix a typo in br_open when configuring IFOPTS: i->1. Add SLAAC security and privacy options. Fix typo of 'default'. Added debugging output around new SLAAC enhancements. Move enabling RA before SLAAC security section. Thanks to davjohn on LQ. Fix domain name validation checks. Thanks to xbeastx74 on LQ for the report. Thanks to Darren "Tadgy" Austin and Robby Workman. n/wireless_tools-30.pre9-x86_64-5.txz: Rebuilt. rc.wireless: don't leave interfaces in up state as it prevents SLAAC. Take interface down at exit from rc.wireless. Thanks to davjohn. x/libgee-0.20.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n/wireless_tools/scripts/rc.wireless')
-rw-r--r--source/n/wireless_tools/scripts/rc.wireless13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/n/wireless_tools/scripts/rc.wireless b/source/n/wireless_tools/scripts/rc.wireless
index 52559ff5b..b9713ade5 100644
--- a/source/n/wireless_tools/scripts/rc.wireless
+++ b/source/n/wireless_tools/scripts/rc.wireless
@@ -61,6 +61,9 @@
# 11/Nov/2019 * Darren Austin * Log to syslog, failling back to stdout.
# Output error to stderr if not called from
# rc.inet1.
+# 09/Mar/2021 * Darren Austin * Don't leave the interface in an 'up' state upon
+# exit from the script - this causes problems for
+# SLAAC in rc.inet1 when control is returned.
# ------------------------------------------------------------------------------
# If possible, log events in /var/log/messages:
@@ -326,11 +329,10 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
echo "$0: WPA authentication did not complete, try running '/etc/rc.d/rc.inet1 ${INTERFACE}_start' in a few seconds." | $LOGGER
fi
# Bring interface up to avoid 'not ready' errors when calling iwconfig
- $IFCOMMAND up
- sleep 3
-
+ # Update 09/Mar/21: No point bringing it up here to be taken down at exit.
+ # $IFCOMMAND up
+ # sleep 3
else
-
# ESSID need to be last: most devices re-perform the scanning/discovery
# when this is set, and things like encryption keys had better be
# defined if we want to discover the right set of APs/nodes.
@@ -344,5 +346,6 @@ else
echo "$0: $IWCOMMAND essid \"$ESSID\"" | $LOGGER
$IWCOMMAND essid "$ESSID"
fi
-
fi
+$IFCOMMAND down
+sleep 3