git://git.onelab.eu
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79aefb6
)
check container starting and SSHD inside it
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 2 Apr 2012 22:02:42 +0000
(
00:02
+0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 2 Apr 2012 22:02:42 +0000
(
00:02
+0200)
vbuild-init-lxc.sh
patch
|
blob
|
history
diff --git
a/vbuild-init-lxc.sh
b/vbuild-init-lxc.sh
index
a2b52e0
..
e29c533
100755
(executable)
--- a/
vbuild-init-lxc.sh
+++ b/
vbuild-init-lxc.sh
@@
-555,9
+555,20
@@
function setup_lxc() {
mkdir $rootfs_path/root/.ssh
cat /root/.ssh/id_rsa.pub >> $rootfs_path/root/.ssh/authorized_keys
mkdir $rootfs_path/root/.ssh
cat /root/.ssh/id_rsa.pub >> $rootfs_path/root/.ssh/authorized_keys
+ # start container
lxc-start -d -n $lxc
lxc-start -d -n $lxc
- sleep 20
+ lxc-wait -n $lxc -s RUNNING
+
+ for i in $(seq 1 5); do
+ echo "ssh ..."
+ ssh_up=$(ssh -o "StrictHostKeyChecking no" $IP 'uname -i')
+ [ -n $ssh_up ] && break
+ sleep 3
+ done
+
+ [ -z $ssh_up ] && echo "SSHD in container $lxc is not running"
+
# rpm --rebuilddb
chroot $rootfs_path rpm --rebuilddb
# rpm --rebuilddb
chroot $rootfs_path rpm --rebuilddb
@@
-865,17
+876,16
@@
function main () {
exit 1
fi
exit 1
fi
- # be strict on lxc-lines matching name exactly using ^<name>$
- # as otherwise the timestamps may show up here
- lxc-ls -1 | grep -q '^'"$lxc"'$' && { echo "container $lxc already exists - exiting" ; exit 1 ; }
-
path=/var/lib/lxc
rootfs_path=$path/$lxc/rootfs
config_path=$path/$lxc
cache_base=/var/cache/lxc/fedora/$arch
cache=$cache_base/$release
root_password=root
path=/var/lib/lxc
rootfs_path=$path/$lxc/rootfs
config_path=$path/$lxc
cache_base=/var/cache/lxc/fedora/$arch
cache=$cache_base/$release
root_password=root
-
+
+ # check whether the rootfs directory is created to know if the container exists
+ # bacause /var/lib/lxc/$lxc is already created while putting $lxc.timestamp
+ [ -d $rootfs_path ] && { echo "container $lxc already exists - exiting" ; exit 1 ; }
setup_lxc $lxc $fcdistro $pldistro $personality
setup_lxc $lxc $fcdistro $pldistro $personality