summaryrefslogtreecommitdiffstats
path: root/remote/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2013-07-05 13:45:33 +0200
committerSimon Rettberg2013-07-05 13:45:33 +0200
commit52c76abb59ff0b991949164e8c622addefd9c8ce (patch)
tree91588108d87b16bd01f43b27def64f3bdaa01fb0 /remote/rootfs
parent[rootfs-stage32] Add swapon command for found swap partition, fixes #458 (diff)
downloadtm-scripts-52c76abb59ff0b991949164e8c622addefd9c8ce.tar.gz
tm-scripts-52c76abb59ff0b991949164e8c622addefd9c8ce.tar.xz
tm-scripts-52c76abb59ff0b991949164e8c622addefd9c8ce.zip
[rootfs-stage31] Remove unneeded mv call, fixes #457
Diffstat (limited to 'remote/rootfs')
-rwxr-xr-xremote/rootfs/rootfs-stage31/data/init5
1 files changed, 2 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 346ccc13..6a718c46 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -98,7 +98,6 @@ fi
[ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: squashfs/nfs mounted, before aufs."
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 || drop_shell "Problem building aufs."
mkdir -p /mnt/uniontmp /mnt/tmp
@@ -107,9 +106,9 @@ 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
-/mnt/opt/openslx/bin/activate-sysconfig /mnt
+/mnt/opt/openslx/bin/activate-sysconfig /mnt 2> /dev/null
if [ ! -e /mnt/opt/openslx/config ]; then
- sleep 0.5
+ sleep 1
/mnt/opt/openslx/bin/activate-sysconfig /mnt
fi
if [ -e /mnt/opt/openslx/config ]; then