summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2021-09-25 13:28:36 -0500
committerWilliam Hubbs <williamh@gentoo.org>2021-09-25 13:59:42 -0500
commit084c51c67b07562ff0cf0df0774dfaf5978dcffd (patch)
tree02e9e70f47c9f0458f7e2fb5fc65d85bcacfbb46
parentgenerate /usr/lib/os-release dynamically (diff)
downloadbaselayout-084c51c67b07562ff0cf0df0774dfaf5978dcffd.tar.gz
baselayout-084c51c67b07562ff0cf0df0774dfaf5978dcffd.tar.bz2
baselayout-084c51c67b07562ff0cf0df0774dfaf5978dcffd.zip
move 00protected-links.conf to /usr/lib/sysctl.d
Bug: https://bugs.gentoo.org/814664 Signed-off-by: William Hubbs <williamh@gentoo.org>
-rw-r--r--Makefile3
-rw-r--r--lib.Linux/sysctl.d/00protected-links.conf (renamed from etc.Linux/sysctl.d/00protected-links.conf)0
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8d74853e..5bd10b91 100644
--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,10 @@ install:
$(INSTALL_DIR) $(DESTDIR)/etc
cp -pPR etc/* etc.$(OS)/* $(DESTDIR)/etc/
echo "Gentoo Base System release ${PV}" > ${DESTDIR}/etc/gentoo-release
+ $(INSTALL_DIR) $(DESTDIR)/usr/lib
+ cp -pPR lib.$(OS)/* $(DESTDIR)/usr/lib/
$(INSTALL_DIR) $(DESTDIR)/usr/share/baselayout
cp -pPR share.$(OS)/* $(DESTDIR)/usr/share/baselayout/
- $(INSTALL_DIR) $(DESTDIR)/usr/lib
./make_os_release $(OS) $(PV) > $(DESTDIR)/usr/lib/os-release
ln -snf ../usr/lib/os-release ${DESTDIR}/etc/os-release
diff --git a/etc.Linux/sysctl.d/00protected-links.conf b/lib.Linux/sysctl.d/00protected-links.conf
index 5e4d7c6f..5e4d7c6f 100644
--- a/etc.Linux/sysctl.d/00protected-links.conf
+++ b/lib.Linux/sysctl.d/00protected-links.conf