ssuominen 14/04/05 11:02:10 Modified: kmod-16.ebuild ChangeLog Log: If /etc/runlevels/sysinit is missing when we are installing for the first time, create the directory. This way we don't have to pull in sys-apps/openrc as a dependency. This bug was reported against sys-fs/udev-init-scripts wrt #487080 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.14 sys-apps/kmod/kmod-16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-16.ebuild?r1=1.13&r2=1.14 Index: kmod-16.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kmod-16.ebuild 22 Mar 2014 18:50:20 -0000 1.13 +++ kmod-16.ebuild 5 Apr 2014 11:02:10 -0000 1.14 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.13 2014/03/22 18:50:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.14 2014/04/05 11:02:10 ssuominen Exp $ EAPI=5 inherit bash-completion-r1 eutils multilib @@ -110,20 +110,23 @@ pkg_postinst() { if use openrc; then - if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then + if [[ -L ${ROOT%/}/etc/runlevels/boot/static-nodes ]]; then ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${ROOT}"etc/runlevels/boot/static-nodes + rm -f "${ROOT%/}"/etc/runlevels/boot/static-nodes fi # Add kmod to the runlevel automatically if this is the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then - ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes + if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${ROOT%/}"/etc/runlevels/sysinit + fi + if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes fi fi - if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then - if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then + if [[ -e ${ROOT%/}/etc/runlevels/sysinit ]]; then + if [[ ! -e ${ROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!" 1.139 sys-apps/kmod/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.139&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.139&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.138&r2=1.139 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- ChangeLog 22 Mar 2014 18:50:20 -0000 1.138 +++ ChangeLog 5 Apr 2014 11:02:10 -0000 1.139 @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/kmod # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.138 2014/03/22 18:50:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.139 2014/04/05 11:02:10 ssuominen Exp $ + + 05 Apr 2014; Samuli Suominen <[email protected]> kmod-16.ebuild: + If /etc/runlevels/sysinit is missing when we are installing for the first + time, create the directory. This way we don't have to pull in sys-apps/openrc + as a dependency. This bug was reported against sys-fs/udev-init-scripts wrt + #487080 22 Mar 2014; Mike Frysinger <[email protected]> kmod-16.ebuild, kmod-9999.ebuild:
