Skip to content
Snippets Groups Projects
Commit b7828404 authored by Julien Bonjean's avatar Julien Bonjean
Browse files

[#1317] Fixed Mandriva timeout

parent 4497f20f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
tools/build-system/launch-build-machine.sh
+ 4
− 4
View file @ b7828404
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Julien Bonjean (julien@bonjean.info) # Author: Julien Bonjean (julien@bonjean.info)
# #
# Creation Date: 2009-04-20 # Creation Date: 2009-04-20
# Last Modified: 2009-06-09 17:51:40 -0400 # Last Modified: 2009-06-23 10:31:34 -0400
##################################################### #####################################################
# #
...@@ -247,10 +247,10 @@ if [ ${DO_PREPARE} ]; then ...@@ -247,10 +247,10 @@ if [ ${DO_PREPARE} ]; then
echo " Doing commit" echo " Doing commit"
cd ${REPOSITORY_DIR} cd ${REPOSITORY_DIR}
git commit -m "[#1262] Updated debian changelogs (${VERSION})" . >/dev/null git commit -m "[#1262] Updated debian changelogs (${VERSION})" .
echo " Pushing commit" echo " Pushing commit"
git push origin master >/dev/null git push origin master
fi fi
# change current branch if needed # change current branch if needed
...@@ -317,7 +317,7 @@ if [ ${DO_MAIN_LOOP} ]; then ...@@ -317,7 +317,7 @@ if [ ${DO_MAIN_LOOP} ]; then
echo "Not needed, already running" echo "Not needed, already running"
else else
cd ${VBOX_USER_HOME} && VBoxHeadless -startvm "${MACHINE}" -p 50000 & cd ${VBOX_USER_HOME} && VBoxHeadless -startvm "${MACHINE}" -p 50000 &
if [[ ${MACHINE} =~ "opensuse" ]]; then if [[ ${MACHINE} =~ "opensuse" || ${MACHINE} =~ "mandriva" ]]; then
STARTUP_WAIT=200 STARTUP_WAIT=200
fi fi
echo "Wait ${STARTUP_WAIT} s" echo "Wait ${STARTUP_WAIT} s"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment