Skip to content

Commit 7b3e75f

Browse files
committed
Fix root_startup path, delay for ofono startup, and break panel to
display signal even on pmos.
1 parent bd249a2 commit 7b3e75f

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

desktop/panel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,14 @@ def tick_battery(m):
141141

142142
def tick_phone(m):
143143
m.wd.update()
144-
if m.wd.status != "ok":
144+
if False and m.wd.status != "ok":
145145
m.signal_text.set_text(m.wd.status)
146146
m.signal_bar.set_text("no signal")
147147
m.signal_bar.set_fraction(0)
148148
return
149149

150150
m.signal_text.set_text(m.wd.network)
151-
m.signal_bar.set_text("")
151+
m.signal_bar.set_text(m.wd.status)
152152
m.signal_bar.set_fraction(m.wd.signal / 100.)
153153

154154
def tick(m):

lib/watchdog.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ def write(m, summary, details):
1919
def read(m):
2020
if not m.enabled:
2121
return None
22+
if not os.path.isfile(m.mypath):
23+
return None
2224
if time.time() - os.stat(m.mypath).st_mtime > m.timeout:
2325
return None
2426
# If mtime is newer than current time, there's probably something

ofone/ofono.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ def modem_init(m):
220220

221221
def startup(m):
222222
m.online_modem()
223+
time.sleep(15)
223224
reg = dbus.Interface(
224225
m.bus.get_object('org.ofono', m.path), 'org.ofono.NetworkRegistration')
225226
m.netreg = reg

startup/phone.sudoers

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%wheel ALL= NOPASSWD: /sbin/shutdown, /sbin/poweroff, /usr/sbin/iw, /sbin/ifconfig, /sbin/route, /sbin/reboot, /usr/sbin/alsactl, /usr/share/unicsy/ofone/ofone, /usr/share/unicsy/startup/root_startup, /usr/bin/amixer
1+
%wheel ALL= NOPASSWD: /sbin/shutdown, /sbin/poweroff, /usr/sbin/iw, /sbin/ifconfig, /sbin/route, /sbin/reboot, /usr/sbin/alsactl, /usr/share/unicsy/ofone/ofone, /usr/share/unicsy/startup/root_startup.py, /usr/bin/amixer

startup/x_startup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def run(m):
4848
wd.progress(10, "hardware")
4949
p = "/usr/share/unicsy/"
5050

51-
sy("sudo "+p+"startup/root_startup")
51+
sy("sudo "+p+"startup/root_startup.py")
5252

5353
# Enable autosleep
5454
# instructions are at

0 commit comments

Comments
 (0)