From 21070d6588c0e9de7dc0bada14036dcced9904a3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Sep 2012 08:53:32 +0200 Subject: Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected. --- debian/changelog | 1 + internet-kiosk/sbin/internet-kiosk-daemon | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd6f71f..352b76c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low - Only create lo interface entries for IK terminals based on Debian squeeze. - On post-squeeze Debian systems /var/run has been moved to /run. - Only mount /proc, /sys, /dev/pts inside chroot if not already mounted. + - Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected. -- Mike Gabriel Tue, 21 Aug 2012 18:14:02 +0200 diff --git a/internet-kiosk/sbin/internet-kiosk-daemon b/internet-kiosk/sbin/internet-kiosk-daemon index ba0ad7e..1a7dac6 100755 --- a/internet-kiosk/sbin/internet-kiosk-daemon +++ b/internet-kiosk/sbin/internet-kiosk-daemon @@ -32,8 +32,8 @@ sub catch_term sub check_x { - my $x=`ps ax | grep Xorg`; - if ( $x=~m/usr.bin.Xorg/ ) + my $x=`ps ax | grep X`; + if ( $x=~m/usr.bin.(Xorg|X)/ ) { return 1; } -- cgit v1.2.3