Merge pull request #16 from prydom/merge-etc

merge /usr/etc into /etc, rather than have non-deterministic behavior
prydom · Mar 30, 2024 · 287069f · 287069f
2 parents f620b42 + 57cadc6
commit 287069f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/config/fedora-kinoite-laptop.yml b/config/fedora-kinoite-laptop.yml
@@ -165,9 +165,10 @@ modules:
       # WORKAROUND: do last because my RPM depends on 1Password not ever being upgraded
       - rpm-ostree install /tmp/config/rpms/1password-ostree-workaround-0.0.0_main-1.fc41.x86_64.rpm
 
-  # WORKAROUND: Put back /opt and copy into /etc/containers/policy.json
+  # WORKAROUND: Put back /opt and merge /usr/etc into /etc
   - type: script
     snippets:
       - rm /opt
       - mv /opt.orig /opt
-      - cp /usr/etc/containers/policy.json /etc/containers/policy.json || true
+      - cp -al /usr/etc /etc
+      - rm -rf /usr/etc