From: NeilBrown Date: Wed, 18 Dec 2013 23:28:29 +0000 (+1100) Subject: Complete transition from /var/run to /run X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=5c398534b5937332eb9dc23b1b4ca833049b82ab;p=plato.git Complete transition from /var/run to /run no more "/var/run" left now. --- diff --git a/alarm/alarm.c b/alarm/alarm.c index c5b9403..50590c3 100644 --- a/alarm/alarm.c +++ b/alarm/alarm.c @@ -219,7 +219,7 @@ void event_deliver(struct alarm_ev *ev) write(f, line, 17); close(f); } - f = open("/var/run/alert/alarm", O_WRONLY | O_CREAT, 0600); + f = open("/run/alert/alarm", O_WRONLY | O_CREAT, 0600); if (f) { write(f, "new\n", 4); close(f); diff --git a/gsm/gsm-getsms.py b/gsm/gsm-getsms.py index fcc0f51..154dcae 100644 --- a/gsm/gsm-getsms.py +++ b/gsm/gsm-getsms.py @@ -405,7 +405,7 @@ def main(): save_mirror(mfile, mirror) if found_one: try: - f = open("/var/run/alert/sms", "w") + f = open("/run/alert/sms", "w") f.write("new") f.close() suspend.abort_cycle() diff --git a/plato/plato_gsm.py b/plato/plato_gsm.py index 0237c3b..c0397b1 100644 --- a/plato/plato_gsm.py +++ b/plato/plato_gsm.py @@ -6,7 +6,7 @@ # button will search for possible carriers # while search, button show how long search has progressed # on succcess, get one button per carrier valid for 2 minutes -# When one is selected, write that to /var/run/gsm/request_carrier +# When one is selected, write that to /run/gsm/request_carrier # # calls: # display incoming phone number and when there is one, allows @@ -22,16 +22,16 @@ from subprocess import Popen, PIPE import os.path, fcntl, time, gobject, re, gtk def record(key, value): - f = open('/var/run/gsm-state/.new.' + key, 'w') + f = open('/run/gsm-state/.new.' + key, 'w') f.write(value) f.close() - os.rename('/var/run/gsm-state/.new.' + key, - '/var/run/gsm-state/' + key) + os.rename('/run/gsm-state/.new.' + key, + '/run/gsm-state/' + key) def recall(key): try: - fd = open("/var/run/gsm-state/" + key) + fd = open("/run/gsm-state/" + key) l = fd.read(1000) fd.close() except IOError: @@ -40,7 +40,7 @@ def recall(key): class carrier(file): def __init__(self, name, owner): - file.__init__(self, name, owner, "/var/run/gsm-state/carrier") + file.__init__(self, name, owner, "/run/gsm-state/carrier") self.buttons = self.cbuttons self.carriers = [] @@ -62,8 +62,8 @@ class carrier(file): if self.carrier_buttons and time.time() - self.carrier_valid < 120: return self.carrier_buttons self.carrier_buttons = None - if (os.path.exists('/var/run/gsm-state/request_carrier') and - os.path.getsize('/var/run/gsm-state/request_carrier') > 1): + if (os.path.exists('/run/gsm-state/request_carrier') and + os.path.getsize('/run/gsm-state/request_carrier') > 1): return ['Search Carriers','Cancel Request'] return ['Search Carriers'] @@ -155,7 +155,7 @@ class calls(file): # display (call logs) # Buttons are "Received" "Dialled" "Dialer" "Contacts" def __init__(self, name, owner): - file.__init__(self, name, owner, '/var/run/gsm-state/status') + file.__init__(self, name, owner, '/run/gsm-state/status') self.buttons = self.cbuttons self.get_name = self.cgetname self.status = '' diff --git a/sound/sound.c b/sound/sound.c index 5e36c3c..10352cc 100644 --- a/sound/sound.c +++ b/sound/sound.c @@ -792,7 +792,7 @@ void dev_close(struct dev *dev, int flush) sigprocmask(SIG_UNBLOCK, &blocked, NULL); } -char *dir = "/var/run/sound"; +char *dir = "/run/sound"; int dfd; struct dev dev; int suspend_handle; diff --git a/utils/dialer.py b/utils/dialer.py index e1dfeef..23957b9 100644 --- a/utils/dialer.py +++ b/utils/dialer.py @@ -21,13 +21,13 @@ # # Interaction with Modem: # - request call-out -# write number to /var/run/gsm-state/call +# write number to /run/gsm-state/call # - answer incoming -# write 'answer' to /var/run/gsm-state/call +# write 'answer' to /run/gsm-state/call # - hang-up -# write empty string to /var/run/gsm-state/call +# write empty string to /run/gsm-state/call # - determine status: on-call, incoming, idle -# examine /var/run/gsm-state/status +# examine /run/gsm-state/status # - send request # - recv reply @@ -39,15 +39,15 @@ from subprocess import Popen from contactdb import contacts def record(key, value): - f = open('/var/run/gsm-state/.new.' + key, 'w') + f = open('/run/gsm-state/.new.' + key, 'w') f.write(value) f.close() - os.rename('/var/run/gsm-state/.new.' + key, - '/var/run/gsm-state/' + key) + os.rename('/run/gsm-state/.new.' + key, + '/run/gsm-state/' + key) def recall(key): try: - fd = open("/var/run/gsm-state/" + key) + fd = open("/run/gsm-state/" + key) l = fd.read(1000) fd.close() except IOError: @@ -93,7 +93,7 @@ class Dialer(gtk.Window): self.outgoing = outgoing_list() - d = dnotify.dir('/var/run/gsm-state') + d = dnotify.dir('/run/gsm-state') self.status_watcher = d.watch('status', self.check_status) self.incoming_watcher = d.watch('incoming', self.check_incoming) self.show() diff --git a/utils/lock.py b/utils/lock.py index e22368a..a3aa82a 100755 --- a/utils/lock.py +++ b/utils/lock.py @@ -31,11 +31,11 @@ # is dark, suspend is allowed to progress. # # Also handle alerts. Alerts are signaled by files appearing in -# /var/run/alert. We respond by: +# /run/alert. We respond by: # - disabling suspend # - triggering a vibrator rumble # - playing a suitable sound by linking a sound from /etc/alert/$name -# to /var/run/sound. A separate program plays the sound. +# to /run/sound. A separate program plays the sound. # - restoring the display to "dim" if it is "off". # @@ -168,7 +168,7 @@ class SetAlerts: return False def action(self, name): - n = '/var/run/sound/10-alert' + n = '/run/sound/10-alert' try: os.symlink(os.path.join(self.actiondir, self.pref, name), n) except: @@ -522,10 +522,10 @@ def main(): screen = EvDev("/dev/input/touchscreen", wake_dim) try: - os.mkdir("/var/run/alert") + os.mkdir("/run/alert") except: pass - alert = SetAlerts("/var/run/alert", "/etc/alert") + alert = SetAlerts("/run/alert", "/etc/alert") #setfile('/sys/bus/spi/devices/spi3.1/threshold', '500') #setfile('/sys/bus/spi/devices/spi3.1/sample_rate','0') #setfile('/sys/bus/spi/devices/spi3.1/taps', '7000 5')