Prechádzať zdrojové kódy

Merge branch 'release' of https://tree.clementinecomputing.com/clementinecomputing/popufare into release

clementinecomputing 5 rokov pred
rodič
commit
68efe2f0ab
1 zmenil súbory, kde vykonal 25 pridanie a 19 odobranie
  1. 25 19
      aux/deploy-busunit-interactive

+ 25 - 19
aux/deploy-busunit-interactive

@@ -539,26 +539,29 @@ fi
 ##### Setup kiosk
 #####
 
-echo -n "Setup kiosk service? [Y/n]: "
-read setupkiosk
-
-if [[ "$setupkiosk" =~ ^[yY]?$ ]] ; then
-
-  echo "  /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service -> /lib/systemd/system/kiosk.service"
-  sudo cp /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service /lib/systemd/system/kiosk.service
-
-  echo "  enabling kiosk.service ('systemctl enable kiosk.service')"
-  sudo systemctl enable kiosk.service
-
-  ## Changing hostname will screw up chromium if it's already been run under a different
-  ## hostname. Remove the files that cause the problems so Chromium can run without
-  ## issue.
-  ##
-  echo "  removing chromium 'Singleton*' files"
-  sudo rm -rf /home/bus/.config/chromium/Singleton*
-fi
+# kiosk now run through startx in the rc.local
+#
 
-echo ""
+#echo -n "Setup kiosk service? [Y/n]: "
+#read setupkiosk
+#
+#if [[ "$setupkiosk" =~ ^[yY]?$ ]] ; then
+#
+#  echo "  /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service -> /lib/systemd/system/kiosk.service"
+#  sudo cp /home/bus/popufare/busunit/rootfs/etc/systemd/system/kiosk.service /lib/systemd/system/kiosk.service
+#
+#  echo "  enabling kiosk.service ('systemctl enable kiosk.service')"
+#  sudo systemctl enable kiosk.service
+#
+#  ## Changing hostname will screw up chromium if it's already been run under a different
+#  ## hostname. Remove the files that cause the problems so Chromium can run without
+#  ## issue.
+#  ##
+#  echo "  removing chromium 'Singleton*' files"
+#  sudo rm -rf /home/bus/.config/chromium/Singleton*
+#fi
+#
+#echo ""
 
 ##### Setup startup
 #####
@@ -578,6 +581,9 @@ if [[ "$setupstartup" =~ ^[yY]?$ ]] ; then
   echo "  /home/bus/popufare/busunit/rootfs/etc/rc.local -> /etc/rc.local"
   sudo cp /home/bus/popufare/busunit/rootfs/etc/rc.local /etc/rc.local
 
+  echo "  setting up splash screen: /home/bus/popufare/busunit/rootfs/usr/share/plymouth/themes/pix/splash.png -> /usr/share/plymouth/themes/pix/splash.png"
+  sudo cp -f /home/bus/popufare/busunit/rootfs/usr/share/plymouth/themes/pix/splash.png /usr/share/plymouth/themes/pix/splash.png
+
 fi
 
 echo ""