3 files changed, 13 insertions, 3 deletions
diff --git a/src/op_mode/dynamic_dns.py b/src/op_mode/dns_dynamic.py
index d41a74db3..76ca5249b 100755
--- a/src/op_mode/dynamic_dns.py
+++ b/src/op_mode/dns_dynamic.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2020 VyOS maintainers and contributors
+# Copyright (C) 2018-2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
diff --git a/src/op_mode/ipsec.py b/src/op_mode/ipsec.py
index db4948d7a..823bd039d 100755
--- a/src/op_mode/ipsec.py
+++ b/src/op_mode/ipsec.py
@@ -729,7 +729,7 @@ def _get_formatted_output_ra_summary(ra_output_list: list):
             sa_remotehost = sa['remote-host'] if 'remote-host' in sa else ''
             sa_remoteid = sa['remote-id'] if 'remote-id' in sa else ''
             sa_ike_proposal = _get_formatted_ike_proposal(sa)
-            sa_tunnel_ip = sa['remote-vips']
+            sa_tunnel_ip = sa['remote-vips'][0]
             child_sa_key = _get_last_installed_childsa(sa)
             if child_sa_key:
                 child_sa = sa['child-sas'][child_sa_key]
diff --git a/src/op_mode/powerctrl.py b/src/op_mode/powerctrl.py
index fd4f86d88..239f766fd 100755
--- a/src/op_mode/powerctrl.py
+++ b/src/op_mode/powerctrl.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018 VyOS maintainers and contributors
+# Copyright (C) 2023 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -102,8 +102,18 @@ def cancel_shutdown():
     else:
         print("Reboot or poweroff is not scheduled")
 
+def check_unsaved_config():
+    from vyos.config_mgmt import unsaved_commits
+
+    if unsaved_commits():
+        print("Warning: there are unsaved configuration changes!")
+        print("Run 'save' command if you do not want to lose those changes after reboot/shutdown.")
+    else:
+        pass
 
 def execute_shutdown(time, reboot=True, ask=True):
+    check_unsaved_config()
+
     action = "reboot" if reboot else "poweroff"
     if not ask:
         if not ask_yes_no(f"Are you sure you want to {action} this system?"):