From e15e81b78a924b80d4a747d433afc4f193ab491e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Canek=20Pel=C3=A1ez=20Vald=C3=A9s?= Date: Thu, 2 Dec 2010 15:08:40 -0600 Subject: [PATCH] Patch to avoid the installation of rules and scripts which call /etc/init.d scripts. --- sys-fs/udev/Manifest | 2 +- sys-fs/udev/udev-164.ebuild | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 943b94b..f4a88f9 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -93,4 +93,4 @@ AUX write_root_link_rule 1064 RMD160 dae5cc41dc790d34a5d29320fa47411dd45547be SH AUX write_root_link_rule-125 1086 RMD160 669f994678f306d97c79d585c615f56b026b1fa7 SHA1 309fd5155e8a010616adcb51a0b717887ba05ec3 SHA256 f8cff0e73ef40c6a9f642aba35136eac6e60d4cdfb54027aad59f6b770c01915 DIST udev-151-testsys.tar.bz2 137712 RMD160 be8c9c99a770b9ba48449dbbea3b4a6367c0c626 SHA1 7194c9e86f88ad64be4bf706d9a33e58882c8231 SHA256 727e2127e497cd0c41e27bda6f1e8e83831226f84c63e732fe78a64ed91a322e DIST udev-164.tar.bz2 557126 RMD160 f169b21c955f96554b8c7af1fd174037e60dfe12 SHA1 ef6c6c707c249246f6d848f6a0a545bff8d903cf SHA256 81db1a089e4c13fd73fbb5ace7974ab84e2d92d8a39fad81d3707d92b6429258 -EBUILD udev-164.ebuild 16417 RMD160 1d4090529c226c145aa807fe8b58e482bbe5a78f SHA1 f9873d1c04d2d81cdb8234ec34c6cfaef4fc440c SHA256 fd76d67fe0b0e7256e24ab5f794b87e62abb76cc72b8e649a83611009a2e65cd +EBUILD udev-164.ebuild 16521 RMD160 e023db41dbfdc6597633cf4d4306fc8b371fa599 SHA1 54ddd3b51c605f35421a25bf8776240fc7bf1fc9 SHA256 1a6169344ab04a47b522a26e404363a05259e0e062b616f96fdf84ba1c39906b diff --git a/sys-fs/udev/udev-164.ebuild b/sys-fs/udev/udev-164.ebuild index aa2bd0b..0cddd65 100644 --- a/sys-fs/udev/udev-164.ebuild +++ b/sys-fs/udev/udev-164.ebuild @@ -213,9 +213,11 @@ src_install() { emake DESTDIR="${D}" install || die "make install failed" exeinto "${udev_libexec_dir}" - newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" - newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ - || die "move_tmp_persistent_rules.sh not installed properly" + if ! use systemd; then + newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + || die "move_tmp_persistent_rules.sh not installed properly" + fi newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ || die "write_root_link_rule not installed properly" @@ -243,7 +245,10 @@ src_install() { insinto "${udev_libexec_dir}"/rules.d/ # Our rules files - doins "${scriptdir}"/??-*.rules + doins "${scriptdir}"/40-gentoo.rules + if ! use systemd; then + doins "${scriptdir}"/90-network.rules + fi # support older kernels doins misc/30-kernel-compat.rules -- 1.7.2.2