summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-22 15:50:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-08-22 15:50:42 +0200
commit543ca9edb2703c75d9c265e7baf77ab3ed5670f5 (patch)
tree1ae5071314d0843ea70e8c7fb719e1a1414de66d
parentec0e109537c6479ad036a8ab457fdd7824485e38 (diff)
downloadinternet-kiosk-543ca9edb2703c75d9c265e7baf77ab3ed5670f5.tar.gz
internet-kiosk-543ca9edb2703c75d9c265e7baf77ab3ed5670f5.tar.bz2
internet-kiosk-543ca9edb2703c75d9c265e7baf77ab3ed5670f5.zip
Use sed to patch initramfs configuration (rather than a patch that fails on wheezy). The change is needed for squeeze only.
-rw-r--r--debian/changelog2
-rwxr-xr-xinternet-kiosk-management/sbin/ik_create8
2 files changed, 3 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 5df5349..dd12a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low
- Provide README.unconfigured file in /etc/internet-kiosk.
- Fix ik_dte_shell.sh script, escape braces.
- 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.
-- 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 3771184..57456ab 100755
--- a/internet-kiosk-management/sbin/ik_create
+++ b/internet-kiosk-management/sbin/ik_create
@@ -141,13 +141,7 @@ chmod +x /sbin/start-stop-daemon
# Pulsaudio must come afterwards
[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y
-[ \$? -eq 0 ] && apt-get install patch -y
-[ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH
-39c39
-< BOOT=local
----
-> BOOT=nfs
-PATCH
+[ \$? -eq 0 ] && sed -e 's/BOOT=local/BOOT=nfs/' -i /etc/initramfs-tools/initramfs.conf
[ \$? -eq 0 ] && rm -f /etc/udev/rules.d/*-persistent-*.rules
[ \$? -eq 0 ] && useradd internet-kiosk
[ \$? -eq 0 ] && adduser internet-kiosk audio