summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-05-22 15:07:55 +0200
committerDirk von Suchodoletz2006-05-22 15:07:55 +0200
commitc4db6c04d5bbd889718c4297d004c56fd0772608 (patch)
tree5b157b71a5aaf68bc91dfb3f2113a88ab7c1da5e /initrd/initrd-stuff/init
parentbetter hw detection for devices on pcmcia, small fix for wrong error (diff)
downloadcore-c4db6c04d5bbd889718c4297d004c56fd0772608.tar.gz
core-c4db6c04d5bbd889718c4297d004c56fd0772608.tar.xz
core-c4db6c04d5bbd889718c4297d004c56fd0772608.zip
small bug fixes and additions ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@229 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
-rwxr-xr-xinitrd/initrd-stuff/init6
1 files changed, 3 insertions, 3 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 8fa2b12a..0d9fb45c 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -2,11 +2,11 @@
# Description: main script for new type of initial ramdisk for
# linux diskless clients version 4
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 21-05-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 22-05-2006
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
#
-# Version: 0.2.4f
+# Version: 0.2.4g
# functions common for all distros, messages contains all error and info
# output
@@ -448,12 +448,12 @@ else
fi
# copy machine configuration (from global settings, additions made within
# here and from dhcp/ldap sources) to client /etc for later checks
-cp /etc/machine-setup /mnt/etc
waitfor /tmp/hwcfg 20000 || error "$init_errhw"
waitfor /tmp/svcfg 20000 || error "$init_errsw"
# IP configuration is made and should not be updated automatically, udevd
# should be killed if started within init
killall -9 dhcpcd dhclient pump 2>/dev/null
+cp /etc/machine-setup /mnt/etc
# post init for some distro specific
postinit