From 877fff69e0e95856bed9ddc6bcf9bceb9ff4a2b1 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Thu, 17 Nov 2016 19:30:39 +0000
Subject: [PATCH] Use the new onl-onie-boot-mode tool.

---
 .../all/vendor-config-onl/src/sbin/uninstall  | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/packages/base/all/vendor-config-onl/src/sbin/uninstall b/packages/base/all/vendor-config-onl/src/sbin/uninstall
index 8fe4742e..c76464d5 100755
--- a/packages/base/all/vendor-config-onl/src/sbin/uninstall
+++ b/packages/base/all/vendor-config-onl/src/sbin/uninstall
@@ -3,26 +3,13 @@ set -e
 
 uninstall_x86_64()
 {
-    #
-    # Set ONIE boot selection to uninstall
-    #
-    mkdir -p /mnt/onie-boot
-    mount -L ONIE-BOOT /mnt/onie-boot > /dev/null 2>&1
 
     if [ "$1" = "factory" ]; then
-    /mnt/onie-boot/onie/tools/bin/onie-boot-mode -o uninstall
+        mode=uninstall
     else
-    /mnt/onie-boot/onie/tools/bin/onie-boot-mode -o install
+        mode=install
     fi
-
-    umount /mnt/onie-boot
-
-    #
-    # Select ONIE as the boot default
-    #
-    onl-mounts mount boot --rw
-    echo "set default=ONIE" >> /mnt/onl/boot/grub/grub.cfg
-    onl-mounts mount boot
+    onl-onie-boot-mode $mode
 }
 
 uninstall_uboot()