diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2013-01-31 00:09:13 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2013-01-31 10:49:32 +0100 |
| commit | 86b258417d5f6b66c43297e70768f7e57e3622f8 (patch) | |
| tree | 1cd352ca3fabf83f0e2287995d05fcff232b13fe /bin | |
| parent | 129cd7ee3a8969ba3b8c44e2638c138cb2131937 (diff) | |
| download | jenkins.debian.net-86b258417d5f6b66c43297e70768f7e57e3622f8.tar.xz | |
Do not set priority=critical for Debian Edu.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/g-i-installation.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index ee222b6c..536350b7 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -176,7 +176,16 @@ bootstrap_system() { ;; *) ;; esac - APPEND="auto=true priority=critical $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet" + case $NAME in + debian-edu_*) + # Debian Edu and tasksel do not work the expected way + # with priority=critical, so do not set it. + ;; + *) + EXTRA_APPEND="$EXTRA_APPEND priority=critical" + ;; + esac + APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet" show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_preseed.cfg echo echo "Starting QEMU now:" |