summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2013-06-01 20:17:44 +0200
committerSimon Rettberg2013-06-01 20:17:44 +0200
commit596e3b8f2ce572b6f4688b8b9c7083bdaa061ac4 (patch)
tree69f4c12b8e37ae5c39ce24ef6216ab688b8a1fc8 /remote/rootfs
parent[vmplayer] Fixed mounting of vmplayer NFS share (diff)
parent[vmplayer] More error checks (diff)
downloadtm-scripts-596e3b8f2ce572b6f4688b8b9c7083bdaa061ac4.tar.gz
tm-scripts-596e3b8f2ce572b6f4688b8b9c7083bdaa061ac4.tar.xz
tm-scripts-596e3b8f2ce572b6f4688b8b9c7083bdaa061ac4.zip
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init4
1 files changed, 2 insertions, 2 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 32903439..4268e6af 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -92,9 +92,9 @@ fi
echo "Building aufs..."
mv /mnt/modprobing /dev/shm/uniontmp
#mount -t overlayfs -o lowerdir=/rorootfs,upperdir=/dev/shm/uniontmp overlayfs /mnt
-mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt
+mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt || { echo "Problem building aufs."; drop_shell; }
mkdir -p /mnt/uniontmp /mnt/tmp
-mount -n --move /dev/shm/uniontmp /mnt/uniontmp
+mount -n --move /dev/shm/uniontmp /mnt/uniontmp || { echo "Problem moving uniontmp."; drop_shell; }
# create udev rule for nic we booted from
echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$MAC'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules"