MycroftOS: More changes to the splash system

buildroot-external/package/mycroft-splash/mycroft-splash-quit.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Terminate Mycroft splash boot Screen
-After=psplash-start.service
+After=mycroft-splash-start.service
 
 [Service]
 Type=oneshot

buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset

@@ -3,18 +3,30 @@ enable wpa_supplicant@wlan0.service
 enable firstboot.service
 enable prepare_system.service
 enable hostname.service
+enable sshd.service
+enable brcm_bt.service
+enable bluetooth.service
+enable pulseaudio.service
+enable avahi-daemon.service
+enable seeed-voicecard.service
+
 enable mycroft-splash-start.service
-enable mycroft-splash-quit.service
+enable mycroft-splash-40.service
+enable mycroft-splash-60.service
 enable mycroft.service
 enable mycroft-messagebus.service
 enable mycroft-voice.service
 enable mycroft-audio.service
 enable mycroft-skills.service
 enable mycroft-enclosure.service
-enable sshd.service
-enable bluetooth.service
-enable pulseaudio.service
-enable avahi-daemon.service
-enable seeed-voicecard.service
 
 disable getty@.service
+disable mosquitto.service
+disable motion.service
+disable mpd.service
+disable shairport-sync.service
+disable snapclient.service
+disable snapserver.service
+disable spotifyd.service
+disable mycroft-splash-quit.service
+

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-audio.service.d/splash.conf

@@ -1,3 +0,0 @@
-[Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. audio service"
-ExecStartPre=-/bin/sleep 2

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-enclosure.service.d/splash.conf

@@ -1,3 +1,3 @@
 [Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. enclosure service"
+ExecStartPre=-/bin/psplash-write "PROGRESS 100"
-ExecStartPre=-/bin/sleep 2
+ExecStartPost=-/bin/psplash-write QUIT

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-messagebus.service.d/splash.conf

@@ -1,3 +1,2 @@
 [Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. messagebus service"
+ExecStartPre=-/bin/psplash-write "PROGRESS 90"
-ExecStartPre=-/bin/sleep 2

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-skills.service.d/splash.conf

@@ -1,3 +0,0 @@
-[Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. skills service"
-ExecStartPre=-/bin/sleep 2

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-40.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Update Mycroft splash boot screen to 40%
+Wants=systemd-networkd.service
+After=systemd-networkd.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=-/usr/bin/psplash-write "PROGRESS 40" 
+
+[Install]
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-60.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Update Mycroft splash boot screen to 60%
+Wants=systemd-networkd-wait-online.service
+After=systemd-networkd-wait-online.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=-/usr/bin/psplash-write "PROGRESS 60" 
+
+[Install]
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-start.service.d/splash.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStartPost=-/bin/sleep 2
+ExecStartPost=-/bin/psplash-write "PROGRESS 10"

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-voice.service.d/splash.conf

@@ -1,3 +0,0 @@
-[Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. voice service"
-ExecStartPre=-/bin/sleep 2

buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft.service.d/splash.conf

@@ -1,3 +1,2 @@
 [Service]
-ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. software stack"
+ExecStartPre=-/bin/psplash-write "PROGRESS 80"
-ExecStartPre=-/bin/sleep 2

buildroot-external/rootfs-overlay/usr/lib/systemd/system/prepare_system.service.d/splash.conf

@@ -1,2 +0,0 @@
-[Service]
-ExecStartPre=-/bin/psplash-write "MSG Preparing system"