summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-08-03 23:32:29 +0200
committerDirk von Suchodoletz2007-08-03 23:32:29 +0200
commit40ebeb75f65189121b6a4835233320a098ab93d5 (patch)
tree58abb2a82d8f89da9fe0860939c36ac163f1b1d2 /initramfs
parent* added OpenSLX build platform as explicit selection to Debian-3.1 (diff)
downloadcore-40ebeb75f65189121b6a4835233320a098ab93d5.tar.gz
core-40ebeb75f65189121b6a4835233320a098ab93d5.tar.xz
core-40ebeb75f65189121b6a4835233320a098ab93d5.zip
Minor cleanup.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1315 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rw-r--r--initramfs/initrd-stuff/etc/functions2
-rwxr-xr-xinitramfs/initrd-stuff/init1
2 files changed, 1 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index a3311d79..8b4a0ee5 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -284,7 +284,7 @@ fi
}
#############################################################################
-# dhcp client function (supporting dhclient, dhcpcd, pump, udhcpc)
+# dhcp client function (supporting dhclient and udhcp, latter is preferred)
rundhcp ()
{
local vci="$1"
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 15d88fc9..ccc0528d 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -271,7 +271,6 @@ if [ ${DEBUGLEVEL} -lt 3 -o ${DEBUGLEVEL} = 8 ] ; then
#!/bin/ash
echo \$$ > /tmp/watchdogpid
[ ! -f /proc/version ] && mount -n -t proc proc /proc
-. /etc/functions
sleep 120 2> /dev/null
echo "o" > /proc/sysrq-trigger
EOF