summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-23 15:56:01 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-23 15:56:01 +0200
commit98988559a841d9bbbaa6b339589dbce75465b11c (patch)
treeac1aa0f2e525883c4eaccac66a89eab42d56244c
parent543ca9edb2703c75d9c265e7baf77ab3ed5670f5 (diff)
downloadinternet-kiosk-98988559a841d9bbbaa6b339589dbce75465b11c.tar.gz
internet-kiosk-98988559a841d9bbbaa6b339589dbce75465b11c.tar.bz2
internet-kiosk-98988559a841d9bbbaa6b339589dbce75465b11c.zip
Symlink /etc/mtab to /proc/mounts before installing any kernels.
-rw-r--r--debian/changelog1
-rwxr-xr-xinternet-kiosk-management/sbin/ik_create9
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index dd12a84..8974fa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low
- Add line breaks after 80 chars in ik_* scripts.
- Use sed to patch initramfs configuration (rather than a patch
that fails on wheezy). The change is needed for squeeze only.
+ - Symlink /etc/mtab to /proc/mounts before installing any kernels.
-- 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 57456ab..81af9ec 100755
--- a/internet-kiosk-management/sbin/ik_create
+++ b/internet-kiosk-management/sbin/ik_create
@@ -120,6 +120,10 @@ echo '#!/bin/sh' > /sbin/start-stop-daemon
echo 'exit 0' >> /sbin/start-stop-daemon
chmod +x /sbin/start-stop-daemon
+# tweak mtab diversion
+[ \$? -eq 0 ] && rm -f /etc/mtab
+[ \$? -eq 0 ] && ln -sf /proc/mounts /etc/mtab
+
[ \$? -eq 0 ] && test -n "$IK_EXTRA_DEBURL" && echo "$IK_EXTRA_DEBURL" > /etc/apt/sources.list.d/itzks.list
[ \$? -eq 0 ] && test -n "$IK_EXTRA_DEBURL" && apt-get update
[ \$? -eq 0 ] && test -n "$IK_EXTRA_DEBURL" && apt-get install itzks-keyring -y --force-yes
@@ -150,10 +154,6 @@ chmod +x /sbin/start-stop-daemon
[ \$? -eq 0 ] && update-initramfs -u -v
[ \$? -eq 0 ] && passwd -l root
-# tweak mtab diversion
-[ \$? -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
@@ -178,6 +178,5 @@ rm -f $IK_CHROOT/etc/udev/rules.d/*-persistent-*.rules
ik_update
-
echo "Internet Kiosk Diskless Terminal creation has finished successfully."
echo