Merge branch 'develop' into debian

2 files changed, 3 insertions, 1 deletions

diff --git a/bootless b/bootless
index 6f72da8..59ff17e 100755
--- a/bootless
+++ b/bootless
@@ -190,6 +190,9 @@ function bootless_image {
     rm ${output}
   fi
 
+  echo "Checking for changes in upstream grub.cfg, in which case you might want to update it..."
+  diff -Naur $APP_BASE/templates/grub.cfg $BOOTLESS_DIR/grub/grub.cfg
+
   echo "Done."
 }
 
diff --git a/todo.mdwn b/todo.mdwn
index 808aba2..c471dca 100644
--- a/todo.mdwn
+++ b/todo.mdwn
@@ -1,4 +1,3 @@
 [[!meta title="TODO"]]
 
-- Always diff grub.cfg.
 - Implement per image/device signature checking.