summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-21 21:42:06 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-21 21:42:06 +0200
commitd911015f863878602f31c70e9cd2ca42969be86b (patch)
tree7b7853e0329178cc3dc45228631c3a0cdbd4b892
parenteae22f6f1d42cce7139442f7651957dfa072d6a0 (diff)
downloadinternet-kiosk-d911015f863878602f31c70e9cd2ca42969be86b.tar.gz
internet-kiosk-d911015f863878602f31c70e9cd2ca42969be86b.tar.bz2
internet-kiosk-d911015f863878602f31c70e9cd2ca42969be86b.zip
Add support for plymouth in diskless terminals.
-rw-r--r--debian/changelog1
-rw-r--r--debian/control3
-rw-r--r--internet-kiosk-management/etc/ik_settings3
-rwxr-xr-xinternet-kiosk-management/sbin/ik_create4
4 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 94b52b2..5a17002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low
* New upstream version (0.0.2):
- Step towards wheezy, use it as default distribution.
+ - Add support for plymouth in diskless terminals.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Aug 2012 18:14:02 +0200
diff --git a/debian/control b/debian/control
index 5e8bcf3..b67cd53 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,9 @@ Recommends:
acpid,
memtest86,
memtest86+,
+ plymouth,
+Suggests:
+ plymouth-themes-all,
Description: Internet Kiosk daemon
Internet Kiosk is a simple tool that provides an internet-cafe-like
terminal. It starts up a web browser with restricted functionality (kiosk mode)
diff --git a/internet-kiosk-management/etc/ik_settings b/internet-kiosk-management/etc/ik_settings
index c06f6f4..6de91d6 100644
--- a/internet-kiosk-management/etc/ik_settings
+++ b/internet-kiosk-management/etc/ik_settings
@@ -16,6 +16,9 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+# name of the interet kiosk platform you are providing (will be shown during boot / plymouth run)
+IK_PRETTY_NAME="Internet Kiosk"
+
# base path for Internet Kiosk diskless machine files
IK_BASE="/opt/internet-kiosk"
diff --git a/internet-kiosk-management/sbin/ik_create b/internet-kiosk-management/sbin/ik_create
index 52de279..8c3622d 100755
--- a/internet-kiosk-management/sbin/ik_create
+++ b/internet-kiosk-management/sbin/ik_create
@@ -36,6 +36,7 @@ source $ETCDIR/ik_settings
IK_BASE="${IK_BASE:-/opt/internet-kiosk}"
IK_CHROOT="${IK_CHROOT:-$IK_BASE/chroot}"
IK_CONFIG="${IK_CONFIG:-$IK_BASE/etc}"
+IK_PRETTY_NAME="${IK_PRETTY_NAME:-Internet Kiosk}"
IK_DISTRO_CODENAME="${IK_DISTRO_CODENAME:-wheezy}"
IK_DEBMIRROR_URL="${IK_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}"
IK_EXTRA_DEBURL="${IK_EXTRA_DEBURL:-'deb http://packages.it-zukunft-schule.de $IK_DISTRO_CODENAME main'}"
@@ -158,6 +159,9 @@ PATCH
[ \$? -eq 0 ] && rm -f /etc/mtab
[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab
+# tweak plymouth
+[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$IK_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$IK_PRETTY_NAME" >> /etc/os-release
+
# restore start-stop-daemon
[ \$(stat --format '%s' /sbin/start-stop-daemon) -lt 200 ] && mv /sbin/start-stop-daemon.keep /sbin/start-stop-daemon