← Back to branch summary

~budgie-remix-dev/debian-cd/budgie-remix-base

« back to all changes in this revision

Viewing changes to tools/boot/wily/boot-amd64+mac

  • Committer: Sean Davis
  • Date: 2016-01-26 02:09:22 UTC
  • mfrom: (1912.2.5 xubuntu-core)
  • Revision ID: smd.seandavis@gmail.com-20160126020922-b1idb7qhl93pis1g
Merge in lp:~unit193/debian-cd/xubuntu-core via lp:~bluesabre/debian-cd/xubuntu-core to work around broken bzr hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/boot/wily/boot-amd64+mac
173
173
HIDDEN_TIMEOUT=
174
174
if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
175
175
    case $PROJECT in
176
 
        ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
 
176
        ubuntu|ubuntu-netbook|xubuntu|xubuntu-core|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
177
177
            HIDDEN_TIMEOUT=2
178
178
            ;;
179
179
        mythbuntu)
336
336
    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
337
337
access-options=v1 v2 brltty m1
338
338
EOF
339
 
elif [ "$PROJECT" = xubuntu ]; then
 
339
elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-core ]; then
340
340
    # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
341
341
    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
342
342
access-options=v2 v3 brltty m2
463
463
EOF
464
464
    fi
465
465
fi
466
 
if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
 
466
if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-core ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
467
467
    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
468
468
label ltsp=Install an LTSP server
469
469
replace ltsp=file=/cdrom/preseed/ltsp.seed