diff options
| author | Anish Mangal <anish@sugarlabs.org> | 2011-02-13 21:22:57 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@sugarlabs.org> | 2011-02-13 21:22:57 (GMT) |
| commit | 97eed31452c4def0fc9e29c498a8a87cfd2b3924 (patch) | |
| tree | 69dee388ce47a784277ade4ce6edd3a311442a4f | |
| parent | 30d275ac4dbc1e54b5ca5fc3476261de986e4e33 (diff) | |
dextrose-platform: redisable mesh after suspend fixes
| -rw-r--r-- | rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch | 16 | ||||
| -rw-r--r-- | rpms/dextrose-platform/dextrose-platform.spec | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch b/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch new file mode 100644 index 0000000..5bd40a0 --- /dev/null +++ b/rpms/dextrose-platform/dextrose-platform-disable_mesh-exit-if-already-disabled.patch @@ -0,0 +1,16 @@ +diff --git a/etc/powerd/postresume.d/disable_mesh.sh b/etc/powerd/postresume.d/disable_mesh.sh +index 7d64c07..0aea85a 100755 +--- a/etc/powerd/postresume.d/disable_mesh.sh ++++ b/etc/powerd/postresume.d/disable_mesh.sh +@@ -26,6 +26,11 @@ + + LBS_MESH=/sys/class/net/eth0/lbs_mesh + ++if [ -f $LBS_MESH ] && [ $(cat $LBS_MESH) = "0x0" ] ++then ++ exit 0 ++fi ++ + while [ ! -f $LBS_MESH ] || [ $(cat $LBS_MESH) = "0x0" ] + do + sleep 0.5s diff --git a/rpms/dextrose-platform/dextrose-platform.spec b/rpms/dextrose-platform/dextrose-platform.spec index 63908b1..a984da0 100644 --- a/rpms/dextrose-platform/dextrose-platform.spec +++ b/rpms/dextrose-platform/dextrose-platform.spec @@ -1,12 +1,15 @@ Name: dextrose-platform Version: 1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A wrapper package containing dextrose-platform specific bugfixes. Group: Applications/Updating License: GPLv3 #URL: http://wiki.sugarlabs.org/go/Dextrose/Updater Source0: http://people.sugarlabs.org/anish/dextrose-platform.tar.gz + +patch1: dextrose-platform-disable_mesh-exit-if-already-disabled.patch + BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -21,6 +24,7 @@ A wrapper package containing dextrose-platform specific bugfixes. %prep %setup -q +%patch1 -p1 %build @@ -43,6 +47,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} /etc/powerd/postresume.d/disable_mesh.sh %changelog +* Tue Feb 10 2011 Anish Mangal <anish@sugarlabs.org> 1-2 +- Disable mesh if already disabled. + * Tue Jan 25 2011 Anish Mangal <anish@sugarlabs.org> 1-1 - Redisable mesh after suspend. |