From a565a05eb344a330a22a7928deedeced3c3b77e8 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 29 Aug 2008 23:45:34 +0000
Subject: Some more cleanup in stage3.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2150 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 1cbee587..88820b86 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -17,7 +17,7 @@
 # fixme: shut down if script fails - this does not really work in case of
 # script crash
 trap "exec (sleep 30; echo o>/proc/sysrq-trigger)" \
-  SIGHUP SIGINT SIGPIPE SIGTERM
+  SIGHUP SIGINT SIGPIPE SIGTERM SIGKILL
 
 # device files get their own filesystem (to be move mounted later)
 devdir="/dev"
@@ -367,7 +367,7 @@ else
     # useless
     if [ -z "$bootmac" ] ; then
       bootmac="$macaddr"
-      error "$init_bootmac" nonfatal
+      [ "$ethif" != "eth0" ] && error "$init_bootmac" nonfatal
     fi
     if [ "$macaddr" = "$bootmac" ] ; then
       nwif=$ethif
-- 
cgit v1.2.3-55-g7522