summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-18 11:33:45 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-18 15:15:13 +0200
commit73925d612b31635e451bc9e31425ea0fa4720900 (patch)
tree1e87be4ccbbd4e2da9ea3f8addcac9e83f4a41eb /bin
parent4593c0e06d75f40d85bce32e1607ed1e9b59e2fc (diff)
downloadjenkins.debian.net-73925d612b31635e451bc9e31425ea0fa4720900.tar.xz
g-i-installation: use unique names for rescue jobs names, use correct
d-i preseed files names.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 0c0d63b0..5bfd912c 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -56,11 +56,9 @@ mkdir -p $RESULTS/log
if [ -z "$5" ] || [ -z "$6" ] ; then
DI_LANG="en"
DI_LOCALE="en_US"
- PRESEEDCFG="preseed.cfg"
else
DI_LANG=$5
DI_LOCALE=$6
- PRESEEDCFG="${DI_LANG}_preseed.cfg"
fi
#
@@ -160,6 +158,7 @@ bootstrap_system() {
QEMU_OPTS="$QEMU_OPTS -drive file=$LV,index=0,media=disk,cache=unsafe -m $RAMSIZE -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
QEMU_WEBSERVER=http://10.0.2.1/
# preseeding related variables
+ PRESEEDCFG="preseed.cfg"
PRESEED_PATH=d-i-preseed-cfgs
PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG"
INST_LOCALE="locale=$DI_LOCALE"