From cf9ce1c0bf1aa560cc6bd941ded4606f2ada8d27 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 18 Oct 2016 11:14:02 +0100
Subject: [PATCH] Enable admin sudoer in non-image install

---
 src/freedombone-image-customise | 4 ----
 src/freedombone-utils-setup     | 7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index f81566d8..d4a08021 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -279,10 +279,6 @@ configure_ssh() {
     fi
 }
 
-admin_user_sudo() {
-    echo "$MY_USERNAME  ALL=(ALL) ALL" >> $rootdir/etc/sudoers
-}
-
 create_generic_image() {
     if [[ $DEBIAN_INSTALL_ONLY != "no" ]]; then
         return
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index a3ea7d22..95872711 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -107,6 +107,10 @@ function initial_setup {
     mark_completed $FUNCNAME
 }
 
+function admin_user_sudo {
+    echo "$MY_USERNAME  ALL=(ALL) ALL" >> $rootdir/etc/sudoers
+}
+
 function search_for_attached_usb_drive {
     # If a USB drive is attached then search for email,
     # gpg, ssh keys and emacs configuration
@@ -412,6 +416,9 @@ function setup_utils {
 
     function_check install_tomb
     install_tomb
+
+    function_check admin_user_sudo
+    admin_user_sudo
 }
 
 function setup_email {