From bf754ab498157856a356e89fc0897df1bf5ecd3a Mon Sep 17 00:00:00 2001
From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Tue, 1 Aug 2017 03:35:34 +0200
Subject: [PATCH] init-install.sh: Save/restore an existing VPN certificate

---
 recipes-core/initrdscripts/files/init-install.sh   | 14 ++++++++++++++
 .../initramfs-live-install_sysmocom.inc            |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/recipes-core/initrdscripts/files/init-install.sh b/recipes-core/initrdscripts/files/init-install.sh
index 4ca4b83..9d70fc4 100644
--- a/recipes-core/initrdscripts/files/init-install.sh
+++ b/recipes-core/initrdscripts/files/init-install.sh
@@ -122,6 +122,14 @@ if [ ! "${device#mmcblk}" = "${device}" ]; then
 fi
 rootfs=/dev/${device}${part_prefix}1
 
+## Backup - only works if install is using the same partition as before
+mkdir -p /bkup_root
+if [ mount -o ro $rootfs /bkup_root ]; then
+	echo "Saving openVPN certificate if it exists"
+	cp -r /bkup_root/etc/openvpn /tmp/ || true
+	umount /bkup_root
+fi
+
 echo "*****************"
 echo "Rootfs partition size: $rootfs_size MB ($rootfs)"
 echo "*****************"
@@ -148,6 +156,12 @@ dd if=/media/$dev_name/$image_name of=$rootfs bs=1024
 # Handling of the target root partition
 mount $rootfs /tgt_root
 
+# Restore OpenVPN certificate and config
+if [ -d /tmp/openvpn/ -a -d /tgt_root/etc/ ]; then
+	echo "Restoring openVPN certificate"
+	cp -r /tmp/openvpn /tgt_root/etc/
+fi
+
 if [ -d /tgt_root/etc/ ] ; then
     # We dont want udev to mount our root device while we're booting...
     if [ -d /tgt_root/etc/udev/ ] ; then
diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
index d507aa3..26efd4d 100644
--- a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
+++ b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
@@ -1,6 +1,6 @@
 SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
 
-PRINC = "2"
+PRINC = "3"
 
 RDEPENDS_${PN} += "e2fsprogs-e2fsck"