From 5a871d4b4e94002adfd91607b3acb530dc7b8ad5 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 13 Sep 2012 08:48:37 +0200 Subject: Only mount /proc, /sys, /dev/pts inside chroot if not already mounted. --- debian/changelog | 1 + internet-kiosk-management/sbin/ik_shell | 6 +++--- internet-kiosk-management/sbin/ik_upgrade | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0a55a3..cd6f71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low system is in maintenance mode. - 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. -- Mike Gabriel Tue, 21 Aug 2012 18:14:02 +0200 diff --git a/internet-kiosk-management/sbin/ik_shell b/internet-kiosk-management/sbin/ik_shell index 93b8ed7..ca17f90 100755 --- a/internet-kiosk-management/sbin/ik_shell +++ b/internet-kiosk-management/sbin/ik_shell @@ -92,9 +92,9 @@ EOF chmod u+x "$IK_CHROOT/ik_dte_shell.sh" mkdir -p $IK_CHROOT/{proc,dev/pts,sys} -mount -tproc proc $IK_CHROOT/proc || true -mount -tsysfs sys $IK_CHROOT/sys || true -mount -tdevpts devts $IK_CHROOT/dev/pts || true +mount | grep $IK_CHROOT/proc >/dev/null || mount -tproc proc $IK_CHROOT/proc || true +mount | grep $IK_CHROOT/sys >/dev/null || mount -tsysfs sys $IK_CHROOT/sys || true +mount | grep $IK_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $IK_CHROOT/dev/pts || true chroot "$IK_CHROOT" /ik_dte_shell.sh diff --git a/internet-kiosk-management/sbin/ik_upgrade b/internet-kiosk-management/sbin/ik_upgrade index 0c527aa..8db0ed4 100755 --- a/internet-kiosk-management/sbin/ik_upgrade +++ b/internet-kiosk-management/sbin/ik_upgrade @@ -91,9 +91,9 @@ EOF chmod u+x "$IK_CHROOT/ik_dte_upgrade.sh" mkdir -p $IK_CHROOT/{proc,dev/pts,sys} -mount -tproc proc $IK_CHROOT/proc || true -mount -tsysfs sys $IK_CHROOT/sys || true -mount -tdevpts devts $IK_CHROOT/dev/pts || true +mount | grep $IK_CHROOT/proc >/dev/null || mount -tproc proc $IK_CHROOT/proc || true +mount | grep $IK_CHROOT/sys >/dev/null || mount -tsysfs sys $IK_CHROOT/sys || true +mount | grep $IK_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $IK_CHROOT/dev/pts || true chroot "$IK_CHROOT" /ik_dte_upgrade.sh -- cgit v1.2.3