12 Commits

Author	SHA1	Message	Date
Colin Watson	b0d34632e1	Merge branch 'upstream' into experimental	2013-12-20 11:09:12 +00:00
Colin Watson	d7777ac026	Regularise indentation of "recordfail" in /etc/grub.d/10_linux.	2013-12-11 14:17:20 +00:00
Colin Watson	aac9cb5a90	Remove stray "fi" in quick_boot.patch.	2013-12-09 00:20:17 +00:00
Colin Watson	8b25ef4a30	Merge branch 'upstream' into experimental	2013-12-08 19:21:39 +00:00
Colin Watson	d3f94fd1bc	Merge branch 'upstream' into experimental	2013-12-03 17:10:32 +00:00
Colin Watson	dee7aaec67	New upstream snapshot.	2013-11-26 23:27:11 +00:00
Colin Watson	54154f04b8	New upstream snapshot.	2013-11-19 19:04:51 +00:00
Colin Watson	4173cb958b	New upstream snapshot.	2013-11-15 16:38:01 +00:00
Colin Watson	6c6996fe24	New upstream snapshot.	2013-11-15 10:21:26 +00:00
Colin Watson	7cf184dd9d	In recovery mode, add nomodeset to the Linux kernel arguments, and remove the 'set gfxpayload=keep' command.	2013-11-14 10:40:32 +00:00
Colin Watson	a2dac38edc	Show the boot menu if the previous boot failed.	2013-11-13 17:55:30 +00:00
Colin Watson	eb0a00804d	If building for Ubuntu, bypass menu unless other OSes are installed or Shift is pressed.	2013-11-13 17:14:04 +00:00