From 862bf8cc9814c0dcc475f131e08218413cce4a32 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Fri, 19 Nov 2010 17:01:05 -0800
Subject: Simplify check for if there are changes to commit after load/merge.

---
 scripts/vyatta-load-config.pl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vyatta-load-config.pl b/scripts/vyatta-load-config.pl
index c9094fd..f3339f7 100755
--- a/scripts/vyatta-load-config.pl
+++ b/scripts/vyatta-load-config.pl
@@ -277,13 +277,8 @@ foreach (@comment_list) {
     #ignore error on complaint re: nested nodes
 }
 
-my $tmp_config_file  = "/tmp/config.boot.$$";
-my $tmp_config_file2 = "/tmp/config.boot2.$$";
-system("cli-shell-api showCfg --show-active-only  > $tmp_config_file");
-system("cli-shell-api showCfg --show-working-only > $tmp_config_file2");
-my $diff = `diff -u $tmp_config_file $tmp_config_file2`;
-system("rm $tmp_config_file $tmp_config_file2");
-if (defined $diff and length($diff) < 1) {
+my $rc = system("cli-shell-api sessionChanged");
+if (defined $rc and $rc > 0) {
     print "No configuration changes to commit\n";
     exit 0;
 }
-- 
cgit v1.2.3