Merge branch 'current' of github.com:vyos/vyos-build into current

This commit is contained in:
Daniil Baturin 2016-01-26 16:12:26 -05:00
commit 1444f5f3e5

View File

@ -34,7 +34,7 @@ util.check_build_config()
lb_config_tmpl = """ lb_config_tmpl = """
lb config noauto \ lb config noauto \
--architectures {{architecture}} \ --architectures {{architecture}} \
--bootappend-live "boot=live components hostname=vyos username=live" \ --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \
--bootloader syslinux \ --bootloader syslinux \
--binary-images iso-hybrid \ --binary-images iso-hybrid \
--debian-installer false \ --debian-installer false \