From: Frank Brehm Date: Thu, 31 May 2018 14:15:33 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4ee806725e94ea33892b603c7a8ef5cdce1d2fcb;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 01812e5c..c70433bc 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2315,6 +2315,8 @@ maybe chmod 0755 'portage' maybe chmod 0644 'portage/bashrc' maybe chmod 0755 'portage/env' maybe chmod 0644 'portage/env/nopie.conf' +maybe chmod 0755 'portage/env/sys-apps' +maybe chmod 0644 'portage/env/sys-apps/systemd' maybe chmod 0644 'portage/make.conf' maybe chmod 0755 'portage/package.accept_keywords' maybe chmod 0644 'portage/package.accept_keywords/common' diff --git a/portage/bashrc b/portage/bashrc index cdc1e7ee..d15eef27 100644 --- a/portage/bashrc +++ b/portage/bashrc @@ -1,3 +1,13 @@ +#!/bin/bash + +for conf in ${PN} ${PN}:${SLOT} ${PN}-${PV} ${PN}-${PV}-${PR}; do + e=/etc/portage/env/${CATEGORY}/${conf} + if [[ -f ${e} ]]; then + einfo "Reading environment from ${e}" + . ${e} + fi +done + case "${EBUILD_PHASE}" in preinst|prerm) etckeeper pre-install ;; postinst|postrm) etckeeper post-install ;; diff --git a/portage/env/sys-apps/systemd b/portage/env/sys-apps/systemd new file mode 100644 index 00000000..8378c1a3 --- /dev/null +++ b/portage/env/sys-apps/systemd @@ -0,0 +1,3 @@ +ABI_X86="64" + +# vim: noai : ts=4 fenc=utf-8 filetype=sh diff --git a/portage/package.use b/portage/package.use index 8383675e..6f9bcba1 100644 --- a/portage/package.use +++ b/portage/package.use @@ -427,6 +427,7 @@ sys-apps/openrc audit sys-apps/paludis glsa inquisitio qa visibility sys-apps/pciutils dns network-cron -zlib sys-apps/portage epydoc gentoo-dev native-extensions python3 +#sys-apps/systemd -abi_x86_32 -abi86_x86_32 libidn2 -sysv-utils sys-apps/systemd libidn2 -sysv-utils sys-apps/usbutils network-cron sys-apps/util-linux ddate loop-aes python_single_target_python3_5 tty-helpers