summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/etc/functions
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-12-15 01:39:48 +0100
committerDirk von Suchodoletz2006-12-15 01:39:48 +0100
commitc6b758e562a15c23c991ce783a9f0b9dbb527601 (patch)
treefc57c53f69a32bccb71f5e6e8d47b758601ccb61 /initramfs/initrd-stuff/etc/functions
parentAutopoweroff if stuck in Stage3/initramfs. Unfortunately rather CPU (diff)
downloadcore-c6b758e562a15c23c991ce783a9f0b9dbb527601.tar.gz
core-c6b758e562a15c23c991ce783a9f0b9dbb527601.tar.xz
core-c6b758e562a15c23c991ce783a9f0b9dbb527601.zip
Added new busybox in new place (tools, Makefile, ...) Busybox has
modified switch_root (same as for run-init ...) Updated mkdxsinitrd for busybox usage (same has to be done for slxmkramfs when tested properly) Minor fixes ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@536 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/etc/functions')
-rw-r--r--initramfs/initrd-stuff/etc/functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 75af6c29..b27dfc66 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -2,7 +2,7 @@
# (included by init, hwautocfg, servconfig, ... within OpenSLX initial
# ramfs)
#
-# Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006
+# Dirk von Suchodoletz <dvs@OpenSLX.com>, 15-12-2006
# Felix Endres, 30-04-2006
# <mj0@uni-freiburg.de> (xenbr), 12-12-2006
# Tobias Maier
@@ -318,7 +318,7 @@ case $mnt in
portmap || { echo "$error_portm"; ret=1; }
# fixme: busybox mount uses nfs ...
mount -n -t nfs -o ro,nolock $nfsroot $dest || ret=1
- killall -9 portmap
+ killall -9 portmap 2>/dev/null
;;
none)
error "$error_mntt"
@@ -406,7 +406,7 @@ command line)." >> /etc/machine-setup
[ -n $vci ] && vci="-V $vci"
testmkd /usr/share/udhcpc
ln -s /bin/dhcpmkconfig /usr/share/udhcpc/default.script
- udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0
+ udhcpc -b -q $vci -s /usr/share/udhcpc/default.script -i eth0 2>/dev/null
;;
*)
;;