diff --git a/.gitignore b/.gitignore index 959387c..49edcec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /crda-3.13.tar.xz -/wireless-regdb-2013.11.27.tar.xz +/wireless-regdb-2014.06.02.tar.xz diff --git a/crda.spec b/crda.spec index 3dda185..13d9e0a 100644 --- a/crda.spec +++ b/crda.spec @@ -1,9 +1,9 @@ %define crda_version 3.13 -%define regdb_version 2013.11.27 +%define regdb_version 2014.06.02 Name: crda Version: %{crda_version}_%{regdb_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -125,6 +125,10 @@ rm -rf %{buildroot} %changelog +* Fri Jun 6 2014 John W. Linville - 3.13_2014.06.02-1 +- Add logger commands to setregdomain to make it more communicative +- Update wireless-regdb to version 2014.06.02 + * Fri Feb 28 2014 John W. Linville - 3.13_2013.11.27-2 - Accomodate relative pathnames in the symlink for /etc/localtime diff --git a/setregdomain b/setregdomain index ab6c4da..4bf8bc5 100755 --- a/setregdomain +++ b/setregdomain @@ -18,6 +18,8 @@ REGDOMAIN=/etc/sysconfig/regdomain LOCALTIME=/etc/localtime +LOGGER="/usr/bin/logger -t crda" + getcountry() { while read c a z r do @@ -46,13 +48,13 @@ then ZONE=${ZONE#/usr/share/zoneinfo/} ZONE=${ZONE#../usr/share/zoneinfo/} else - echo "Timezone information not found! Unable to set regulatory domain." + $LOGGER -s "Timezone information not found! Unable to set regulatory domain." exit fi if [ -z "$ZONE" ] then - echo "Timezone information not set! Unable to set regulatory domain." + $LOGGER -s "Timezone information not set! Unable to set regulatory domain." exit fi @@ -60,8 +62,9 @@ COUNTRY=$(getcountry) if [ -z "$COUNTRY" ] then - echo "Could not determine country! Unable to set regulatory domain." + $LOGGER -s "Could not determine country! Unable to set regulatory domain." exit fi +$LOGGER "setting regulatory domain to $COUNTRY based on timezone ($ZONE)" /usr/sbin/iw reg set $COUNTRY diff --git a/sources b/sources index eb69346..48c5468 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 66b1b0417c1ad19f0009a5c0c0c1aebc crda-3.13.tar.xz -5d00474713f4d3d287b0ca19860a83e8 wireless-regdb-2013.11.27.tar.xz +7f2bdda89b79b759ebc0c435345dcb76 wireless-regdb-2014.06.02.tar.xz