From c2fe7ec6609c541ef7cca7d8df65864bf923175d Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 29 Apr 2007 15:27:11 +0000
Subject: Disabled the trap (problem with SIGIO), should be discussed, how to
 handle in the long run ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@955 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/initrd-stuff/init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'initramfs/initrd-stuff/init')

diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 3d2a80c0..c36c92c1 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -65,8 +65,8 @@ mkdir -p ${devdir}/.udevdb
 [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys
 
 # fixme: shut down if script fails
-trap "exec (sleep 30; echo o>/proc/sysrq-trigger)" \
-  SIGHUP SIGINT SIGPIPE SIGTERM SIGIO
+#trap "exec (sleep 30; echo o>/proc/sysrq-trigger)" \
+#  SIGHUP SIGINT SIGPIPE SIGTERM SIGIO
 
 # if no kernel version is set, try to get it directly from /proc
 if [ -z $KERNEL ] ; then
@@ -119,7 +119,7 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     ;;
     # if configuration should not be gathered by dhcp client
     nodhcp)
-      nodhcp="no"
+      nodhcp="yes"
       echo "nodhcp" > /tmp/dhcp-done
     ;;
     # if ldap configuration should be triggered
-- 
cgit v1.2.3-55-g7522