summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-04-29 17:27:11 +0200
committerDirk von Suchodoletz2007-04-29 17:27:11 +0200
commitc2fe7ec6609c541ef7cca7d8df65864bf923175d (patch)
treefe4f242730dddca4e451508a8d01a77883fb68c1 /initramfs/initrd-stuff/init
parent* fixed bugs when setting up the resolver for 64-bit hosts. (diff)
downloadcore-c2fe7ec6609c541ef7cca7d8df65864bf923175d.tar.gz
core-c2fe7ec6609c541ef7cca7d8df65864bf923175d.tar.xz
core-c2fe7ec6609c541ef7cca7d8df65864bf923175d.zip
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
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-xinitramfs/initrd-stuff/init6
1 files changed, 3 insertions, 3 deletions
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