summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorChristian Rößler2013-06-25 14:21:58 +0200
committerChristian Rößler2013-06-25 14:21:58 +0200
commita6b4ce21d53013af61d341bf91ebad032ecc33bb (patch)
tree6c3362cc5166e38b7620e53c9e6a3f64708efaba /remote/rootfs
parentBetter detection of pango-querymodules/pango-querymodules-64 in case of 64bit OS (diff)
parent[pam] Remove required files which cannot be found (diff)
downloadtm-scripts-a6b4ce21d53013af61d341bf91ebad032ecc33bb.tar.gz
tm-scripts-a6b4ce21d53013af61d341bf91ebad032ecc33bb.tar.xz
tm-scripts-a6b4ce21d53013af61d341bf91ebad032ecc33bb.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init5
1 files changed, 4 insertions, 1 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 586b21df..3a1087df 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -107,11 +107,14 @@ mount -n --move /dev/shm/uniontmp /mnt/uniontmp || drop_shell "Problem moving un
[ $DEBUG -ge 2 ] && drop_shell "Requested Debug Shell: after aufs'ing."
# Download config if available
+(
+sleep 1
/mnt/opt/openslx/bin/activate-sysconfig /mnt
+) &
# create udev rule for nic we booted from
cat > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" <<HEREEND
-SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="$MAC", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="br0"
+SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="$MAC", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"
HEREEND
# create ip config