diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-09-13 08:53:32 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-09-13 08:53:32 +0200 |
| commit | 21070d6588c0e9de7dc0bada14036dcced9904a3 (patch) | |
| tree | a87b091e613be881028bcf672c40525415618135 | |
| parent | 5a871d4b4e94002adfd91607b3acb530dc7b8ad5 (diff) | |
| download | internet-kiosk-21070d6588c0e9de7dc0bada14036dcced9904a3.tar.gz internet-kiosk-21070d6588c0e9de7dc0bada14036dcced9904a3.tar.bz2 internet-kiosk-21070d6588c0e9de7dc0bada14036dcced9904a3.zip | |
Xorg appears as /usr/bin/X in ps ax output. Make sure it gets detected.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | 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 <mike.gabriel@das-netzwerkteam.de> 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; } |