diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-13 01:30:47 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-11-13 01:30:47 +0100 |
commit | 577d9b4ea9a2f3a63be63edb0dd9224f657e249c (patch) | |
tree | f6fbd13296b6305cb8fbbc5370d72c5593141f4d /bin/g-i-installation.sh | |
parent | 76ba2eff4297cfc03e80d966cec518f03c5a111d (diff) | |
parent | 77a0ccd429f5f9729e8066541977557ff4bb7e98 (diff) | |
download | jenkins.debian.net-577d9b4ea9a2f3a63be63edb0dd9224f657e249c.tar.xz |
Merge branch 'master' of git://git.debian.org/git/qa/jenkins.debian.net
Diffstat (limited to 'bin/g-i-installation.sh')
-rw-r--r-- | bin/g-i-installation.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 1f5c46da..7234800e 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -318,7 +318,12 @@ bootstrap_system() { *) ;; esac fi - echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER + case $NAME in + *_kfreebsd) # not supported for the --append option + ;; + *) echo "--append \"$APPEND\"" >> $QEMU_LAUNCHER + ;; + esac set -x (bash -x $QEMU_LAUNCHER && touch $RESULTS/qemu_quit ) & set +x |