From fa44ce461e86f6e4537e5b4ebb0d30422b40eba2 Mon Sep 17 00:00:00 2001 From: Alex Bradbury Date: Tue, 10 Sep 2013 14:37:05 +0100 Subject: [PATCH] bump version --- debian/changelog | 7 +++++++ raspi-config | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d6e0db3..c6330d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +raspi-config (20130910-1) unstable; urgency=low + + * Bugfix for boot to scratch + * Bugfix for detecting flavour set by NOOBS + + -- Alexander Bradbury Tue, 10 Sep 2013 14:36:14 +0100 + raspi-config (20130909-1) unstable; urgency=low * Support boot to scratch and applying language/keyboard settings from noobs diff --git a/raspi-config b/raspi-config index 5baa436..09d3129 100755 --- a/raspi-config +++ b/raspi-config @@ -466,8 +466,8 @@ do_boot_behaviour() { Scratch) if [ -e /usr/bin/scratch ]; then [ -e /etc/init.d/lightdm ] && update-rc.d lightdm disable 2 - enable_boot_to_scratch disable_raspi_config_at_boot + enable_boot_to_scratch else whiptail --msgbox "Do sudo apt-get install scratch to allow configuration of boot to scratch" 20 60 2 fi @@ -577,7 +577,7 @@ do_apply_os_config() { if [ -n "$NOOBSFLAVOUR" ]; then printf "Setting flavour to %s based on os_config.json from NOOBS. May take a while\n" "$NOOBSFLAVOUR" - if [ "$NOOBSFLAVOUR" = "Scratch" ]; then + if printf "%s" "$NOOBSFLAVOUR" | grep -q "Scratch"; then disable_raspi_config_at_boot enable_boot_to_scratch else