From: Thierry Parmentelat Date: Fri, 27 May 2011 10:22:22 +0000 (+0200) Subject: utility to get single_ip right X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4139609455bd92533c092a7875b7e414e801cab0;p=infrastructure.git utility to get single_ip right --- diff --git a/scripts/create-vm.sh b/scripts/create-vm.sh index ce2e09c..6baafc5 100755 --- a/scripts/create-vm.sh +++ b/scripts/create-vm.sh @@ -49,7 +49,7 @@ cd $BUILD git pull cd - -command="$BUILD/vtest-init-vserver.sh -p $PERSO -f $DISTRO $HOSTNAME none -- --netdev eth0 --interface $ip --hostname $fqdn" +command="$BUILD/vtest-init-vserver.sh -p $PERSO -f $DISTRO $HOSTNAME none -- --netdev eth0 --interface $ip --interface nodev:127.0.0.1 --hostname $fqdn" --flags '~single_ip' if [ -n "$INTERACTIVE" ] ; then echo -n "Run $command OK ? " diff --git a/scripts/fix-vserver.sh b/scripts/fix-vserver.sh new file mode 100755 index 0000000..82d74c4 --- /dev/null +++ b/scripts/fix-vserver.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +### make sure a vserver is properly configured for our environment +# esp. useful on the f14 setup + +function fix_vserver () { + vs=$1; shift + cd /etc/vservers/$vs/apps/init + rm -f style + cd - >&/dev/null + cd /etc/vservers/$vs/interfaces + rm -rf 0/dev 0/mask 1 prefix dev nodev + echo 21 > 0/prefix ; touch 0/nodev + cd - >&/dev/null + cd /etc/vservers/$vs + echo 'persistent,lback_allow,~single_ip' > nflags + cd - >&/dev/null +} + +function main () { + if [[ -z "$@" ]] ; then + args=$(cd /etc/vservers ; ls) + else + args="$@" + fi + for vs in $args; do fix_vserver $vs ; done +} + +main "$@"