diff --git a/packaging/linux-common/nymea-splash-horizontal.jpg b/packaging/linux-common/nymea-splash-horizontal.jpg deleted file mode 100755 index d4dddd4d..00000000 Binary files a/packaging/linux-common/nymea-splash-horizontal.jpg and /dev/null differ diff --git a/packaging/linux-common/nymea-splash-horizontal.png b/packaging/linux-common/nymea-splash-horizontal.png new file mode 100644 index 00000000..40f2abcd Binary files /dev/null and b/packaging/linux-common/nymea-splash-horizontal.png differ diff --git a/packaging/linux-common/nymea-splashscreen.service b/packaging/linux-common/nymea-splashscreen.service index d6908d8f..f886bb80 100644 --- a/packaging/linux-common/nymea-splashscreen.service +++ b/packaging/linux-common/nymea-splashscreen.service @@ -1,10 +1,11 @@ [Unit] -Description=nymea sSplash screen +Description=nymea splash screen DefaultDependencies=no After=local-fs.target +ConditionKernelCommandLine=!nosplash [Service] -ExecStart=/usr/bin/fbi --noverbose -d /dev/fb0 -a /usr/share/nymea-splashscreen/nymea-splash-horizontal.jpg -fitwidth +ExecStart=/usr/bin/fbi --noverbose -d /dev/fb0 -a /usr/share/nymea-splashscreen/nymea-splash-horizontal.png -fitwidth StandardInput=tty StandardOutput=tty #TTYPath=/dev/tty1 diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control index 2b4b441f..15af1cac 100644 --- a/packaging/ubuntu/debian/control +++ b/packaging/ubuntu/debian/control @@ -77,7 +77,7 @@ Package: nymea-splashscreen Architecture: any Section: shells Multi-Arch: same -Depends: plymouth, +Depends: fbi, Description: A nymea branded fbi splash theme This package will install a nymea branded boot splash using fbi. diff --git a/packaging/ubuntu/debian/nymea-splashscreen.install b/packaging/ubuntu/debian/nymea-splashscreen.install index 1acca22a..8b35f7bc 100644 --- a/packaging/ubuntu/debian/nymea-splashscreen.install +++ b/packaging/ubuntu/debian/nymea-splashscreen.install @@ -1,2 +1,2 @@ packaging/linux-common/nymea-splashscreen.service /lib/systemd/system/ -packaging/linux-common/nymea-splash-horizontal.jpg /usr/share/nymea-splashscreen/ +packaging/linux-common/nymea-splash-horizontal.png /usr/share/nymea-splashscreen/