From 2667ad6204bb93fe50f8de9775d52f9ff4bcd176 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Tue, 21 Apr 2020 13:05:55 +0200 Subject: [PATCH] MycroftOS: More changes to the splash system --- .../mycroft-splash-quit.service | 2 +- .../systemd/system-preset/10-mycroftos.preset | 24 ++++++++++++++----- .../mycroft-audio.service.d/splash.conf | 3 --- .../mycroft-enclosure.service.d/splash.conf | 4 ++-- .../mycroft-messagebus.service.d/splash.conf | 3 +-- .../mycroft-skills.service.d/splash.conf | 3 --- .../systemd/system/mycroft-splash-40.service | 11 +++++++++ .../systemd/system/mycroft-splash-60.service | 11 +++++++++ .../splash.conf | 3 +++ .../mycroft-voice.service.d/splash.conf | 3 --- .../system/mycroft.service.d/splash.conf | 3 +-- .../prepare_system.service.d/splash.conf | 2 -- 12 files changed, 48 insertions(+), 24 deletions(-) delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-audio.service.d/splash.conf delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-skills.service.d/splash.conf create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-40.service create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-60.service create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-start.service.d/splash.conf delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-voice.service.d/splash.conf delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/prepare_system.service.d/splash.conf diff --git a/buildroot-external/package/mycroft-splash/mycroft-splash-quit.service b/buildroot-external/package/mycroft-splash/mycroft-splash-quit.service index 572ce4ec..6210860a 100644 --- a/buildroot-external/package/mycroft-splash/mycroft-splash-quit.service +++ b/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 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset index 705bee2a..73723f36 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset +++ b/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 + diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-audio.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-audio.service.d/splash.conf deleted file mode 100644 index 24683d96..00000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-audio.service.d/splash.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. audio service" -ExecStartPre=-/bin/sleep 2 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-enclosure.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-enclosure.service.d/splash.conf index a62e1c9e..5c45e271 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-enclosure.service.d/splash.conf +++ b/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/sleep 2 +ExecStartPre=-/bin/psplash-write "PROGRESS 100" +ExecStartPost=-/bin/psplash-write QUIT diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-messagebus.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-messagebus.service.d/splash.conf index 0b855811..4e7047f7 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-messagebus.service.d/splash.conf +++ b/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/sleep 2 +ExecStartPre=-/bin/psplash-write "PROGRESS 90" diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-skills.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-skills.service.d/splash.conf deleted file mode 100644 index ac29884b..00000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-skills.service.d/splash.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. skills service" -ExecStartPre=-/bin/sleep 2 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-40.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-40.service new file mode 100644 index 00000000..622ef0b5 --- /dev/null +++ b/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 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-60.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-60.service new file mode 100644 index 00000000..cb0ebdb3 --- /dev/null +++ b/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 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-start.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-splash-start.service.d/splash.conf new file mode 100644 index 00000000..519ecd83 --- /dev/null +++ b/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" diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-voice.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-voice.service.d/splash.conf deleted file mode 100644 index daedcfcd..00000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft-voice.service.d/splash.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStartPre=-/bin/psplash-write "MSG Starting Mycroft A.I. voice service" -ExecStartPre=-/bin/sleep 2 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft.service.d/splash.conf index c3b80b6a..d0044e18 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/mycroft.service.d/splash.conf +++ b/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/sleep 2 +ExecStartPre=-/bin/psplash-write "PROGRESS 80" diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/prepare_system.service.d/splash.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/prepare_system.service.d/splash.conf deleted file mode 100644 index e99f271e..00000000 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/prepare_system.service.d/splash.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=-/bin/psplash-write "MSG Preparing system"