From ea49b321acd50c16c54f6e9dbd90c0c4113e73de Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Wed, 4 Apr 2018 20:09:10 +0200
Subject: [PATCH] initramfs-live-install: adapt to new mountpoint in /run

Since new poky/base components, automount mounts devices in /run/media,
not /media anymore.
---
 recipes-core/initrdscripts/files/init-install.sh              | 4 ++--
 .../initrdscripts/initramfs-live-install_sysmocom.inc         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-core/initrdscripts/files/init-install.sh b/recipes-core/initrdscripts/files/init-install.sh
index 4ca4b83..17e2edc 100644
--- a/recipes-core/initrdscripts/files/init-install.sh
+++ b/recipes-core/initrdscripts/files/init-install.sh
@@ -143,7 +143,7 @@ mkdir /tgt_root
 mkdir -p /boot
 
 echo "Copying rootfs files..."
-dd if=/media/$dev_name/$image_name of=$rootfs bs=1024
+dd if=/run/media/$dev_name/$image_name of=$rootfs bs=1024
 
 # Handling of the target root partition
 mount $rootfs /tgt_root
@@ -218,7 +218,7 @@ echo "Re-mounting the root and trying to apply backup."
 mount $rootfs /tgt_root
 
 echo "Finding backupfiles"
-backupfile=`find /media/$dev_name/ -name "sysmocom-backup*.tar" | head -n1`
+backupfile=`find /run/media/$dev_name/ -name "sysmocom-backup*.tar" | head -n1`
 if [ -n "$backupfile" ]; then
     if [ ! -r "$backupfile" ]; then
         echo "configurations-file $backupfile it is not readable"
diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc
index 7e3d1f6..541315f 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(d.getVar('FILE', True))}"
 FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:"
 
-PRINC = "2"
+PRINC = "3"
 
 RDEPENDS_${PN} += "e2fsprogs-e2fsck"