diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-10-20 19:04:32 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-10-20 19:04:32 +0000 |
| commit | 5ebad110965e8fcefe386612871601ceb1dd3360 (patch) | |
| tree | 0a5ac64f43df77bfac36c44e1a070bde4590843d | |
| parent | Bump (diff) | |
| download | historical-5ebad110965e8fcefe386612871601ceb1dd3360.tar.gz historical-5ebad110965e8fcefe386612871601ceb1dd3360.tar.bz2 historical-5ebad110965e8fcefe386612871601ceb1dd3360.zip | |
Auto enable udev-postmount only if udev is enabled.
Package-Manager: portage-2.2_rc46/cvs/Linux i686
| -rw-r--r-- | sys-fs/udev/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/udev/Manifest | 10 | ||||
| -rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 25 |
3 files changed, 25 insertions, 15 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 3c509bb0511a..cb77f334933f 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.500 2009/10/20 12:38:15 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.501 2009/10/20 19:04:32 zzam Exp $ + + 20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> udev-9999.ebuild: + Auto enable udev-postmount only if udev is enabled. 20 Oct 2009; Matthias Schwarzott <zzam@gentoo.org> files/147/shell-compat-addon.sh, udev-9999.ebuild, files/147/udev.initd, diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 1180c43aad5f..ee696d2bcfa0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -75,13 +75,13 @@ EBUILD udev-145-r3.ebuild 15407 RMD160 be741872a7fe457e088ff2111eb315b65c7225f1 EBUILD udev-145.ebuild 13607 RMD160 b0895ed911a6d6c4d45d14364e8c11259f52a463 SHA1 011bcbe8eadfd05385c2a39b96c9776ff7bdc34a SHA256 d4f95324a07c0a53df1397719b7aef06b10538a67ddf46a68549b1eff4d551d3 EBUILD udev-146-r1.ebuild 15411 RMD160 92b896131c4b6316030f5b9d086ab583a691f1bf SHA1 5dd50a2206eb10b1056f6c09c9db996cd7f0f2e3 SHA256 da93a288c65490d3d22e98f61f17d71792cadd7a5794abab31808f28c5348ef5 EBUILD udev-146.ebuild 15340 RMD160 d2d6ac34af9271ecba096607e01e679547b7df3c SHA1 c1d1cd2e96a395065b93315af38412d5f1c5f6ea SHA256 ea450be06bf24a677a89c89b89d8a04c49acae66c77a4d71aed92c998d1f8103 -EBUILD udev-9999.ebuild 15662 RMD160 63931e70ece56a259ef70064d64fa3b476627b88 SHA1 2ce8dd3bab796cb84deef8012ea5a4a3e91a0ea1 SHA256 15a38e566750ddc77825ad2c0c3cf08b4ae35cf52d4652b350ad77d003ec63fc -MISC ChangeLog 102918 RMD160 679f24b0bfd859330eb9b657d82504e5726cd09c SHA1 e370d6a77aaf6fb9538b242b3d540036aa9181ce SHA256 3a60839e883c706849eee64789c35324de7fc15cff9851d03a31abfe0ee91783 +EBUILD udev-9999.ebuild 16004 RMD160 5573d647475ba52310cb1f480941350c23cc6a92 SHA1 39cca7ce7c0333ed840a80ce64e13882c223fb66 SHA256 0103289a0cf39c0047602222f663906e4fab0468c6e130eb5e000d2a067fa762 +MISC ChangeLog 103044 RMD160 a65bf3a632127a9c123c81df3dfa8b744d2d29ff SHA1 129e979bfcb570270213e095240353ac802aba1a SHA256 522b0e14be02647f9bd8ff8e514c86340e4dc163b39546adf6244b3efa6ab189 MISC metadata.xml 402 RMD160 fad8844286866f47eadb2fd958f54f650976fe2a SHA1 c966d4e9e509d399523d1ba6ef54277e750334de SHA256 1c524286463bf115615462e9504c27710331f1d82a0828de5d78686f5e303ed5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkrdr0QACgkQt2vP6XvVdOfW1ACgmvmsmBzsKHwlReQPtSvgL+ln -A7kAn00UVc0WhKwlx3yGU/rhcETeg7HJ -=wNAb +iEYEARECAAYFAkreCcYACgkQt2vP6XvVdOde9wCeO3KZVr1ZrhrKYHel0hfsFYGM +dp8AoMWzCiRKimDatur+sUhEjGjtzN8G +=IiIG -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index c014c8ae2d46..03869a32e484 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.17 2009/10/20 12:38:15 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.18 2009/10/20 19:04:32 zzam Exp $ EAPI="1" @@ -349,9 +349,6 @@ pkg_preinst() { has_version "<${CATEGORY}/${PN}-113" previous_less_than_113=$? - - has_version "<${CATEGORY}/${PN}-146-r2" - previous_less_than_146_r2=$? } # 19 Nov 2008 @@ -410,10 +407,8 @@ restart_udevd() { } postinst_init_scripts() { - # FIXME: we need some code like - # if use bootstrap; then - # add init-scripts - # fi + # FIXME: we may need some code that detects if this is a system bootstrap + # and auto-enables udev then # # FIXME: inconsistent handling of init-scripts here # * udev is added to sysinit in openrc-ebuild @@ -434,7 +429,15 @@ postinst_init_scripts() { # add udev-postmount to default runlevel instead of that ugly injecting # like a hotplug event, 2009/10/15 - if [[ $previous_less_than_146_r2 = 0 ]] + + # already enabled? + [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return + + local enable_postmount=0 + [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1 + [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1 + + if [[ ${enable_postmount} = 1 ]] then local initd=udev-postmount @@ -444,6 +447,10 @@ postinst_init_scripts() { ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd} elog "Auto-adding '${initd}' service to your default runlevel" fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" fi } |