summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-09-13 08:42:49 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-09-13 08:42:49 +0200
commit4cf281640b05e94139b46ab5ef807094161b9252 (patch)
tree005bcb37ec79e2575874e0b926b5d212d20f4de8
parent1b6c8603d38bd373946ede68811f34650c56a0cb (diff)
downloadinternet-kiosk-4cf281640b05e94139b46ab5ef807094161b9252.tar.gz
internet-kiosk-4cf281640b05e94139b46ab5ef807094161b9252.tar.bz2
internet-kiosk-4cf281640b05e94139b46ab5ef807094161b9252.zip
On post-squeeze Debian systems /var/run has been moved to /run.
-rw-r--r--debian/changelog1
-rwxr-xr-xinternet-kiosk-management/sbin/ik_create13
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b6667dc..c0a55a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low
- Provide start-stop-daemon wrapper, allows machines to boot while
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.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Aug 2012 18:14:02 +0200
diff --git a/internet-kiosk-management/sbin/ik_create b/internet-kiosk-management/sbin/ik_create
index 34facc4..29655c8 100755
--- a/internet-kiosk-management/sbin/ik_create
+++ b/internet-kiosk-management/sbin/ik_create
@@ -88,9 +88,7 @@ none /dev/pts devpts gid=5,mode=620,noauto 0 0
none /tmp tmpfs size=50M,mode=1777 0 0
none /root tmpfs size=100M,mode=700 0 0
none /etc/udev/rules.d tmpfs size=50M 0 0
-none /var/run tmpfs size=50M 0 0
none /var/log tmpfs size=50M 0 0
-none /var/lock tmpfs size=50M 0 0
none /home tmpfs size=50M 0 0
none /media tmpfs size=50M 0 0
none /var/lib/nfs tmpfs size=50M 0 0
@@ -99,6 +97,17 @@ none /var/lib/dbus tmpfs size=50M 0 0
none /var/lib/alsa tmpfs size=50M 0 0
EOF
+# differences between Debian versions
+if [ "$IK_DISTRO_CODENAME" = "squeeze" ]; then
+ cat >> $IK_CHROOT/etc/fstab <<EOF
+none /var/run tmpfs size=50M 0 0
+none /var/lock tmpfs size=50M 0 0
+EOF
+elif [ "$IK_DISTRO_CODENAME" = "wheezy" ]; then
+ cat >> $IK_CHROOT/etc/fstab <<EOF
+none /run tmpfs size=50M 0 0
+EOF
+fi
cat > $IK_CHROOT/ik_dte_install.sh <<EOF
#!/bin/bash