summaryrefslogtreecommitdiffstats
path: root/initramfs/stage3-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-08-30 01:45:34 +0200
committerDirk von Suchodoletz2008-08-30 01:45:34 +0200
commita565a05eb344a330a22a7928deedeced3c3b77e8 (patch)
tree6c5bb461aaeb9e71325b539d0f57930244d7aa0e /initramfs/stage3-stuff/init
parent* Added suse-gfx-install.sh (diff)
downloadcore-a565a05eb344a330a22a7928deedeced3c3b77e8.tar.gz
core-a565a05eb344a330a22a7928deedeced3c3b77e8.tar.xz
core-a565a05eb344a330a22a7928deedeced3c3b77e8.zip
Some more cleanup in stage3.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2150 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/init')
-rwxr-xr-xinitramfs/stage3-stuff/init4
1 files changed, 2 insertions, 2 deletions
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