From 2f1bd054ea8bbd7ff2bacd763df4fd913b9af674 Mon Sep 17 00:00:00 2001
From: hoopsurfer <britt@johnstons.com>
Date: Sat, 7 Apr 2018 17:37:57 -0700
Subject: [PATCH] Split reboot (#11)

* better comments in services

* Update pidesktop-powerkey.service

* Update pidesktop-shutdown.service

* Create pidesktop-reboot.service

* Update pidesktop-reboot.service

* Update pidesktop-shutdown.service

* Update postinst

add reboot service

* Update postrm

add reboot service

* Create pd-reboot.py

new reboot service file

* split out reboot service
---
 Makefile                                      |   9 ++++++-
 pidesktop-base.deb                            | Bin 4178 -> 4534 bytes
 pidesktop-base/DEBIAN/control                 |   2 +-
 pidesktop-base/DEBIAN/postinst                |   1 +
 pidesktop-base/DEBIAN/postrm                  |   4 ++-
 .../systemd/system/pidesktop-powerkey.service |   4 +--
 .../systemd/system/pidesktop-reboot.service   |  11 ++++++++
 .../systemd/system/pidesktop-shutdown.service |   6 ++---
 .../usr/share/pidesktop/python/pd-powerkey.py |  12 ++++++---
 .../usr/share/pidesktop/python/pd-reboot.py   |  25 ++++++++++++++++++
 .../usr/share/pidesktop/python/pd-shutdown.py |  25 +++++++++++++-----
 .../usr/share/pidesktop/script/pd-check       |  18 ++++++-------
 12 files changed, 89 insertions(+), 28 deletions(-)
 create mode 100644 pidesktop-base/lib/systemd/system/pidesktop-reboot.service
 create mode 100644 pidesktop-base/usr/share/pidesktop/python/pd-reboot.py

diff --git a/Makefile b/Makefile
index 29acc17..f6387dc 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,13 @@ clean: pidesktop-base.deb
 install: pidesktop-base.deb
 	sudo dpkg -i pidesktop-base.deb
 
+test:
+	cp pidesktop-base/usr/share/pidesktop/script/pd-check       /usr/share/pidesktop/script
+	cp pidesktop-base/usr/share/pidesktop/script/pd-clonessd    /usr/share/pidesktop/script
+	cp pidesktop-base/usr/share/pidesktop/python/pd-bootssd.py  /usr/share/pidesktop/python
+	cp pidesktop-base/usr/share/pidesktop/python/pd-fixrtc.py   /usr/share/pidesktop/python
+	cp pidesktop-base/usr/share/pidesktop/python/pd-powerkey.py /usr/share/pidesktop/python
+	cp pidesktop-base/usr/share/pidesktop/python/pd-shutdown.py /usr/share/pidesktop/python
+
 uninstall:
 	sudo dpkg -r pidesktop-base
-
diff --git a/pidesktop-base.deb b/pidesktop-base.deb
index a13aa9a76f93d6110a5549ebc0ddf04815fba0d6..cc3df9cb9b494426bffa9e4b8e711404830fed25 100644
GIT binary patch
delta 4476
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
O#Ao{g000001X)^{Pn4Gc

delta 4119
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
KlNLB8@c#h%MAZra

diff --git a/pidesktop-base/DEBIAN/control b/pidesktop-base/DEBIAN/control
index fb04f40..09510af 100755
--- a/pidesktop-base/DEBIAN/control
+++ b/pidesktop-base/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: pidesktop-base
-Version: 0.1.4
+Version: 0.1.5
 Section: free
 Priority: optional
 Architecture: all
diff --git a/pidesktop-base/DEBIAN/postinst b/pidesktop-base/DEBIAN/postinst
index de67c7f..4ff30b2 100755
--- a/pidesktop-base/DEBIAN/postinst
+++ b/pidesktop-base/DEBIAN/postinst
@@ -12,6 +12,7 @@ sudo ln -sv /usr/share/pidesktop/python/pd-fixrtc.py /usr/bin/pd-fixrtc
 
 # enable new sevices
 sudo systemctl enable pidesktop-powerkey.service
+sudo systemctl enable pidesktop-reboot.service
 sudo systemctl enable pidesktop-shutdown.service
 sudo systemctl list-unit-files | grep pidesktop
 
diff --git a/pidesktop-base/DEBIAN/postrm b/pidesktop-base/DEBIAN/postrm
index e26db14..f365d75 100755
--- a/pidesktop-base/DEBIAN/postrm
+++ b/pidesktop-base/DEBIAN/postrm
@@ -8,8 +8,10 @@ sudo rm -f /usr/bin/pd-fixrtc
 
 # stop systemd services
 sudo systemctl stop pidesktop-powerkey.service
+sudo systemctl stop pidesktop-reboot.service
 sudo systemctl stop pidesktop-shutdown.service
 sudo systemctl disable pidesktop-powerkey.service
+sudo systemctl disable pidesktop-reboot.service
 sudo systemctl disable pidesktop-shutdown.service
 
 # remove any residual systemd files
@@ -17,4 +19,4 @@ sudo rm -f /lib/systemd/system/pidesktop-*.service
 sudo rm -f /etc/systemd/system/*.target.wants/pidesktop-*.service
 
 # other changes to consider... TODO: automate this
-echo "NOTE: The file /boot/config.txt may enable RTC"
+echo "NOTE: The file /boot/config.txt may leave RTC enabled"
diff --git a/pidesktop-base/lib/systemd/system/pidesktop-powerkey.service b/pidesktop-base/lib/systemd/system/pidesktop-powerkey.service
index ba57957..640921d 100644
--- a/pidesktop-base/lib/systemd/system/pidesktop-powerkey.service
+++ b/pidesktop-base/lib/systemd/system/pidesktop-powerkey.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=PiDesktop Power Button Service
+Description=pidesktop power button service
 After=local-fs.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/python /usr/share/pidesktop/python/pd-powerkey.py
+ExecStart=/usr/bin/python -u /usr/share/pidesktop/python/pd-powerkey.py
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pidesktop-base/lib/systemd/system/pidesktop-reboot.service b/pidesktop-base/lib/systemd/system/pidesktop-reboot.service
new file mode 100644
index 0000000..282b604
--- /dev/null
+++ b/pidesktop-base/lib/systemd/system/pidesktop-reboot.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=pidesktop reboot service
+DefaultDependencies=no
+Before=reboot.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/python -u /usr/share/pidesktop/python/pd-reboot.py
+
+[Install]
+WantedBy=reboot.target
diff --git a/pidesktop-base/lib/systemd/system/pidesktop-shutdown.service b/pidesktop-base/lib/systemd/system/pidesktop-shutdown.service
index 3482f03..0adce83 100644
--- a/pidesktop-base/lib/systemd/system/pidesktop-shutdown.service
+++ b/pidesktop-base/lib/systemd/system/pidesktop-shutdown.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=PiDesktop Shutdown Reboot Service
+Description=pidesktop shutdown service
 DefaultDependencies=no
 Before=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/python /usr/share/pidesktop/python/pd-shutdown.py
+ExecStart=/usr/bin/python -u /usr/share/pidesktop/python/pd-shutdown.py
 
 [Install]
-WantedBy=reboot.target shutdown.target
+WantedBy=shutdown.target
diff --git a/pidesktop-base/usr/share/pidesktop/python/pd-powerkey.py b/pidesktop-base/usr/share/pidesktop/python/pd-powerkey.py
index c8c49a5..d11cc1d 100755
--- a/pidesktop-base/usr/share/pidesktop/python/pd-powerkey.py
+++ b/pidesktop-base/usr/share/pidesktop/python/pd-powerkey.py
@@ -1,15 +1,17 @@
-#!/user/bin/env python
+#!/usr/bin/env python
 #
-# pd-powerkey.py - monitor GPIO to detect power key press
+# pd-powerkey.py - monitor GPIO to detect power key press from Power MCU (PCU)
 #
 
 import RPi.GPIO as GPIO
 import time,os,sys
 
+print("pidesktop: power button service initializing")
+
 GPIO.setwarnings(False)
 GPIO.setmode(GPIO.BOARD)
-GPIO.setup(31,GPIO.OUT)  # Pi to Power MCU - start shutdown timer
-GPIO.setup(33,GPIO.IN)   # Power MCU to Pi - power key pressed
+GPIO.setup(31,GPIO.OUT)  # Pi to PCU - start/stop shutdown timer
+GPIO.setup(33,GPIO.IN)   # PCU to Pi - detect power key pressed
 
 GPIO.output(31,GPIO.LOW)  # tell PCU we are alive
 GPIO.output(31,GPIO.HIGH) # cause blink by starting shutdown timer
@@ -18,11 +20,13 @@
 
 # callback function
 def powerkey_pressed(channels):
+    print("pidesktop: power button press detected, initiating shutdown")
     os.system("sync")
     os.system("shutdown -h now")
     sys.exit()
 
 # wait for power key press
+print("pidesktop: power button monitor enabled")
 GPIO.add_event_detect(33,GPIO.RISING,callback=powerkey_pressed)
 
 # idle - TODO: use wait
diff --git a/pidesktop-base/usr/share/pidesktop/python/pd-reboot.py b/pidesktop-base/usr/share/pidesktop/python/pd-reboot.py
new file mode 100644
index 0000000..7f647d8
--- /dev/null
+++ b/pidesktop-base/usr/share/pidesktop/python/pd-reboot.py
@@ -0,0 +1,25 @@
+#!/user/bin/env python
+
+# pd-reboot.py - oneshot service so do your thing and exit
+#
+# We are in reboot processing either because reboot is running. 
+#
+import RPi.GPIO as GPIO
+import os
+
+GPIO.setwarnings(False)
+GPIO.setmode(GPIO.BOARD) # Use physical board pin numbering
+GPIO.setup(31,GPIO.OUT)  # Pi to Power MCU communication
+GPIO.setup(33,GPIO.IN)   # Power MCU to Pi on power button
+
+# In practice detecting power button press is unfortunately not reliable, message if detected
+if GPIO.input(33):
+	# Power Key was already pressed - shut the system down immediately
+	print("pidesktop: reboot service unexpected power button detected")
+else:
+	# reboot initiated do whatever is needed on reboot
+	# GPIO.output(31,GPIO.HIGH) #  tell power MCU and exit immediately
+	print("pidesktop: reboot service active")
+
+# we're done
+print("pidesktop: reboot service completed")
diff --git a/pidesktop-base/usr/share/pidesktop/python/pd-shutdown.py b/pidesktop-base/usr/share/pidesktop/python/pd-shutdown.py
index aeb4951..5ee6438 100755
--- a/pidesktop-base/usr/share/pidesktop/python/pd-shutdown.py
+++ b/pidesktop-base/usr/share/pidesktop/python/pd-shutdown.py
@@ -5,11 +5,11 @@
 # We are in shutdown processing either because shutdown or reboot is running or because
 # the power button was pressed.  If we're here because the power button was pressed then 
 # Power MCU is already in Waiting OFF state and will turn off immediately if it sees 
-# pin 31 go high.  If power button has not been pressed we should inform power MCU 
+# pin 31 go high so avoid that!  If power button has not been pressed we should inform power MCU 
 # shutdown/reboot is taking place so the shutdown timer can start.
 #
 # Note: The timer will reset when the Pi powers off so the only purpose REALLY for doing
-# this is to force a power off if shutdown hangs for some reason - somewhat lame.
+# this is to capture the current system time in the real time clock.
 
 import RPi.GPIO as GPIO
 import os
@@ -17,13 +17,24 @@
 GPIO.setwarnings(False)
 GPIO.setmode(GPIO.BOARD) # Use physical board pin numbering
 GPIO.setup(31,GPIO.OUT)  # Pi to Power MCU communication
-GPIO.setup(33,GPIO.IN)   # Power MCU to Pi on power button press
-
-# stash the current system clock setting into the RTC hardware
-os.system("/sbin/hwclock --systohc")
+GPIO.setup(33,GPIO.IN)   # Power MCU to Pi on power button
 
+# In practice detecting power button press is unfortunately not reliable, message if detected
 if GPIO.input(33):
 	# Power Key was already pressed - shut the system down immediately
+	print("pidesktop: shutdown service initated from power button")
 else:
 	# shutdown or reboot not related to power key
-	GPIO.output(31,GPIO.HIGH) #  tell power MCU and exit immediately
+	# GPIO.output(31,GPIO.HIGH) #  tell power MCU and exit immediately
+	print("pidesktop: shutdown service active")
+
+#  unmount SD card to clean up logs
+print("pidesktop: shutdown service unmounting SD card")
+os.system("umount /dev/mmcblk0p1")
+
+# stash the current system clock setting into the RTC hardware
+print("pidesktop: shutdown service saving system clock to hardware clock")
+os.system("/sbin/hwclock --systohc")
+
+# we're done
+print("pidesktop: shutdown service completed")
diff --git a/pidesktop-base/usr/share/pidesktop/script/pd-check b/pidesktop-base/usr/share/pidesktop/script/pd-check
index b0529c4..45e6f04 100755
--- a/pidesktop-base/usr/share/pidesktop/script/pd-check
+++ b/pidesktop-base/usr/share/pidesktop/script/pd-check
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# show script and python files
-echo -e "pidesktop\n\n Scripts and python files:\n"
-ls -laR /usr/share/pidesktop
+# show scripts and python files
+echo -e "pidesktop\n\n Script files:\n"
+ls -laR /usr/share/pidesktop/*
 
 # show links to pd- commands
 echo -e "\n Links to commands:\n"
@@ -10,12 +10,12 @@ ls -la /usr/bin/pd-*
 
 # show sevices
 echo -e "\n Systemd services:\n"
-sudo systemctl list-unit-files | grep pidesktop
+systemctl --plain --no-legend list-unit-files 'pidesktop-*'
 
 # show RTC hwclock
-echo -e "\n Hardware clock:\n"
-sudo hwclock -r
+echo -e "\n System and hardware clocks:\n"
+timedatectl status
 
-# show System clock
-echo -e "\n System clock:\n"
-date
+# show installed version
+echo -e "\n Package status:\n"
+dpkg -s pidesktop-base