From 59916f47dd47e884a9e24bec61682aa9638165ac Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 2 Oct 2018 16:33:50 +0200
Subject: T867: set the upgraded flag on image update if the user choses to
 save configuration.

---
 scripts/install/install-image-existing | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index f38e3701..21984906 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -218,6 +218,10 @@ if [ $space_avail -gt $space_needed_configdata ]; then
       mkdir -p $ndir
       find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \
         -exec cp '-a' '{}' "$ndir/" ';'
+
+      # Set the upgraded flag
+      touch $ndir/.upgraded
+
       chgrp -R vyattacfg $ndir
       chmod -R 775 $ndir
       if [ -x $DEMO_MIGRATE_SCRIPT ]; then
-- 
cgit v1.2.3


From b90c59b269a581d54f6317ef336f7be877eca649 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 2 Oct 2018 16:35:07 +0200
Subject: Remove some remnant of the Vyatta Subscription days.

---
 scripts/install/install-image-existing | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index 21984906..4fdfeda2 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -203,8 +203,6 @@ fi
 space_needed_configdata=`du -s ${VYATTA_NEW_CFG_DIR} | awk  '{ print $1 }'`
 space_needed_config=$(($space_needed_configdata - $space_needed_data))
 
-DEMO_MIGRATE_SCRIPT=/opt/vyatta/sbin/demo-to-vse.pl
-
 # save current config dir if needed
 if [ $space_avail -gt $space_needed_configdata ]; then
   resp=''
@@ -224,9 +222,6 @@ if [ $space_avail -gt $space_needed_configdata ]; then
 
       chgrp -R vyattacfg $ndir
       chmod -R 775 $ndir
-      if [ -x $DEMO_MIGRATE_SCRIPT ]; then
-	  $DEMO_MIGRATE_SCRIPT $ndir/config.boot
-      fi
     fi
   done
 else
-- 
cgit v1.2.3