[gnome-build-meta/valentindavid/ostee-root-bash-config] ostree-config: Fix conflicts with bash-config from Freedesktop SDK

[Valentin David <valentindavid src gnome org>]

commit df44ce9b1263fe5dca3d4db59c9170d1a2c093fe
Author: Valentin David <valentin david codethink co uk>
Date:   Fri Jul 16 12:29:19 2021 +0200

    ostree-config: Fix conflicts with bash-config from Freedesktop SDK
    
    bash-config installs files in `/root`, but this has to be replaced by
    a symlink. `/var/roothome` is created by tmpfiles.d so, we need to
    copy the initial files there.

 elements/vm/ostree-config.bst      | 1 +
 files/vm/ostree-config/ostree.conf | 2 ++
 2 files changed, 3 insertions(+)
---
diff --git a/elements/vm/ostree-config.bst b/elements/vm/ostree-config.bst
index 33994bb0..afdd3f8e 100644
--- a/elements/vm/ostree-config.bst
+++ b/elements/vm/ostree-config.bst
@@ -37,6 +37,7 @@ config:
     mkdir -p "%{install-root}/sysroot"
     ln -s sysroot/ostree "%{install-root}/ostree"
     ln -s var/home "%{install-root}/home"
+    rm -rf "%{install-root}/root"
     ln -s var/roothome "%{install-root}/root"
     ln -s run/media "%{install-root}/media"
 
diff --git a/files/vm/ostree-config/ostree.conf b/files/vm/ostree-config/ostree.conf
index 6f59c1a4..90f122e1 100644
--- a/files/vm/ostree-config/ostree.conf
+++ b/files/vm/ostree-config/ostree.conf
@@ -2,3 +2,5 @@ d /var/log/journal 2755 root systemd-journal -
 d /var/home 0755 root root -
 d /var/roothome 0700 root root -
 d /run/media 0755 root root -
+C /var/roothome/.profile - - - /etc/skel/.profile
+C /var/roothome/.bashrc - - - /etc/skel/.bashrc