Allow replacing a file with a compatibility symlink

This means we can do stuff like moving /etc/os-release into /usr/lib
and leaving a compatibility symlink where the file was.

Previously baserock-system-config-sync would fail with the following:

    ERROR: found two different types for 'os-release': regular and
    symlink

One of the 'failure' test cases now passes, and I've added a specific
test for our 'os-release' case to the 'symblinks' test case too.

25 files changed, 22 insertions, 0 deletions

diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/default b/tests/bscs-merge.pass/regular.symb.in/systems/default
index 0f51808..0f51808 120000
--- a/tests/bscs-merge.fail/regular.symb.in/systems/default
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/default
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.in/systems/factory/orig/etc/1
index e69de29..e69de29 100644
--- a/tests/bscs-merge.fail/regular.symb.in/systems/factory/orig/etc/1
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/factory/orig/etc/1
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1 b/tests/bscs-merge.pass/regular.symb.in/systems/factory/run/etc/1
index 6a93f4f..6a93f4f 120000
--- a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/1
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/factory/run/etc/1
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile b/tests/bscs-merge.pass/regular.symb.in/systems/factory/run/etc/afile
index e69de29..e69de29 100644
--- a/tests/bscs-merge.fail/regular.symb.in/systems/factory/run/etc/afile
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/factory/run/etc/afile
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.in/systems/version2/orig/etc/1
index e69de29..e69de29 100644
--- a/tests/bscs-merge.fail/regular.symb.in/systems/version2/orig/etc/1
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/version2/orig/etc/1
diff --git a/tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1 b/tests/bscs-merge.pass/regular.symb.in/systems/version2/run/etc/1
index e69de29..e69de29 100644
--- a/tests/bscs-merge.fail/regular.symb.in/systems/version2/run/etc/1
+++ b/tests/bscs-merge.pass/regular.symb.in/systems/version2/run/etc/1
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/default b/tests/bscs-merge.pass/regular.symb.out/systems/default
new file mode 120000
index 0000000..0f51808
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/default
@@ -0,0 +1 @@
+factory
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/orig/etc/1
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1
new file mode 120000
index 0000000..6a93f4f
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/1
@@ -0,0 +1 @@
+afile
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/factory/run/etc/afile
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/orig/etc/1
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1 b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/1
diff --git a/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/bscs-merge.pass/regular.symb.out/systems/version2/run/etc/afile
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/os-release b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/orig/etc/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/os-release b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/factory/run/etc/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release
new file mode 120000
index 0000000..c4c75b4
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/etc/os-release
@@ -0,0 +1 @@
+../usr/lib/os-release
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/usr/lib/os-release b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/usr/lib/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/orig/usr/lib/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/os-release b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/os-release
new file mode 120000
index 0000000..c4c75b4
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/etc/os-release
@@ -0,0 +1 @@
+../usr/lib/os-release
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.in/systems/version2/run/usr/lib/os-release b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/usr/lib/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.in/systems/version2/run/usr/lib/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/os-release b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/orig/etc/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/os-release b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/factory/run/etc/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/os-release b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/os-release
new file mode 120000
index 0000000..c4c75b4
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/etc/os-release
@@ -0,0 +1 @@
+../usr/lib/os-release
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/usr/lib/os-release b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/usr/lib/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/orig/usr/lib/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/os-release b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/os-release
new file mode 120000
index 0000000..c4c75b4
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/etc/os-release
@@ -0,0 +1 @@
+../usr/lib/os-release
\ No newline at end of file
diff --git a/tests/bscs-merge.pass/symblinks.out/systems/version2/run/usr/lib/os-release b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/usr/lib/os-release
new file mode 100644
index 0000000..39715ee
--- /dev/null
+++ b/tests/bscs-merge.pass/symblinks.out/systems/version2/run/usr/lib/os-release
@@ -0,0 +1,2 @@
+Hi, I'm 'os-release'. I start out living in /etc, but then I get moved to
+/usr/lib and I'm replaced with a compatibility symlink.