[crda] Accomodate relative pathnames in the symlink for /etc/localtime

John W. Linville linville at fedoraproject.org
Fri Feb 28 20:22:28 UTC 2014


commit f88f26e2e2435f4f06aed66e5124c47cae32d3ad
Author: John W. Linville <linville at tuxdriver.com>
Date:   Fri Feb 28 15:23:22 2014 -0500

    Accomodate relative pathnames in the symlink for /etc/localtime

 crda.spec    |    5 ++++-
 setregdomain |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/crda.spec b/crda.spec
index f12b036..3dda185 100644
--- a/crda.spec
+++ b/crda.spec
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -125,6 +125,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 28 2014 John W. Linville <linville at redhat.com> - 3.13_2013.11.27-2
+- Accomodate relative pathnames in the symlink for /etc/localtime
+
 * Fri Feb 14 2014 John W. Linville <linville at redhat.com> - 3.13_2013.11.27-1
 - Update crda to version 3.13
 - Remove obsolete patch for regdbdump to display DFS region
diff --git a/setregdomain b/setregdomain
index e8a1ed0..ab6c4da 100755
--- a/setregdomain
+++ b/setregdomain
@@ -44,6 +44,7 @@ if [ -f "$LOCALTIME" ]
 then
 	ZONE=$(readlink $LOCALTIME)
 	ZONE=${ZONE#/usr/share/zoneinfo/}
+	ZONE=${ZONE#../usr/share/zoneinfo/}
 else
 	echo "Timezone information not found!  Unable to set regulatory domain."
 	exit


More information about the scm-commits mailing list