From ba7865c9f416e1993ad3c8d9420f8a951896a151 Mon Sep 17 00:00:00 2001
From: spl <simon@raspberrypi.org>
Date: Fri, 6 May 2016 16:48:51 +0100
Subject: [PATCH] Current state of serial i/f reflected in raspi-config.

---
 raspi-config | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/raspi-config b/raspi-config
index ad4afef..2923da4 100755
--- a/raspi-config
+++ b/raspi-config
@@ -682,7 +682,8 @@ do_i2c() {
 
 do_serial() {
   DEFAULT=
-  if ! grep -q "console=ttyAMA0" /boot/cmdline.txt && ! grep -q "console=serial0" /boot/cmdline.txt ; then
+  CUR_SERIAL=$(get_serial)
+  if [ $CUR_SERIAL -eq 1 ] ; then
       DEFAULT=--defaultno
   fi