Merge branch 'upstream'
authorIan Kelling <iank@fsf.org>
Tue, 24 Nov 2020 22:12:32 +0000 (17:12 -0500)
committerIan Kelling <iank@fsf.org>
Tue, 24 Nov 2020 22:12:32 +0000 (17:12 -0500)
commitfe81034ee9664d8e131bac218b40d99a58a31649
tree10a30856377caaa26a863d5390b2bcd4874d326c
parent53db7c23cb11661c98a08d69295bb315c392003b
parent7ade5e2c6113530c5f99cfc95880897fcb479f39
Merge branch 'upstream'

Switched UBUNTU to use DEBIAN + UBUNTU to be more in line with
upstream. I expect this may break things.
fai/config/basefiles/mk-basefile
fai/config/class/50-host-classes
fai/config/class/DEBIAN.var
fai/config/class/UBUNTU.var
fai/config/hooks/updatebase.UBUNTU
fai/config/scripts/DEBIAN/40-misc
fai/config/scripts/GRUB_PC/10-setup
fai/config/scripts/LAST/50-misc
fai/config/scripts/UBUNTU/90-apt