diff options
| author |   Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-06-21 16:01:43 +0200 |
|---|---|---|
| committer | Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-06-21 16:03:25 +0200 |
| commit | 3d406126c17b2bea0d594a802ac4679ca20beaaf (patch) | |
| tree | 5b4a71e0b80dcecb370eb88ce66a5237d2f0ca7c | |
| parent | sys-apps/systemd: Bump to v29, update 9999 ebuild (diff) | |
| download | systemd-3d406126c17b2bea0d594a802ac4679ca20beaaf.tar.gz systemd-3d406126c17b2bea0d594a802ac4679ca20beaaf.tar.bz2 systemd-3d406126c17b2bea0d594a802ac4679ca20beaaf.zip | |
sys-fs/udev: remove, in-tree is fine, update sys-apps/systemd
101 files changed, 4 insertions, 7569 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 8554b39..12c6db4 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,4 +1,4 @@ DIST systemd-29.tar.bz2 810407 RMD160 49cf7906a768217190cdf61d102058b9c8762d40 SHA1 5dc36e8d900085af31a96a6bafaba228bc8225c7 SHA256 c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971 -EBUILD systemd-29.ebuild 3346 RMD160 73d7a20821cecf752cc5c4281846175fe4bec6cc SHA1 c1a8b0084aa2686ef607c8152445fd1bad5866bf SHA256 c98c077cf207cefd6f3d1c7b999244c58b979927fd59ee7bfcc65ab28ee0fe43 -EBUILD systemd-9999.ebuild 3348 RMD160 eb103148994d510375b78ffa20e595cbf3530867 SHA1 d3e55ed27a87fd29f55e6f465da4b1adf19ea769 SHA256 d23609d91684f802d1a4acfe5e2b20b12f63908b69e0fa1659dfb142619f7274 +EBUILD systemd-29.ebuild 3312 RMD160 ebc58f75dd8e165e197b7568d10b82282ae5d0bc SHA1 a0604a3d3a1d3a8e8f06d966639da5fb7b00e65e SHA256 5bbeb514cd07b42cbf7b8e96b7a1dc7c10f29cc965da63ae7450383af6980a78 +EBUILD systemd-9999.ebuild 3314 RMD160 84b7e008fa351cbc69b97a69a05fa6236b767a02 SHA1 e286a4715f986a49b92ac43e7b92f5bb34d4f453 SHA256 82aa41291cbc7b05442f2f70c1517e314a0ac19ff66dcbe3ed4a9a9f7745bd42 MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d diff --git a/sys-apps/systemd/systemd-29.ebuild b/sys-apps/systemd/systemd-29.ebuild index 2559f65..c90c80e 100644 --- a/sys-apps/systemd/systemd-29.ebuild +++ b/sys-apps/systemd/systemd-29.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="audit cryptsetup gtk pam plymouth selinux tcpd" COMMON_DEPEND=">=sys-apps/dbus-1.4.10 - || ( >=sys-fs/udev-171 >=sys-fs/udev-163[systemd] ) + >=sys-fs/udev-171 >=sys-apps/util-linux-2.19 sys-libs/libcap audit? ( >=sys-process/audit-2 ) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 758f2a3..9de8de8 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="audit cryptsetup gtk pam plymouth selinux tcpd" COMMON_DEPEND=">=sys-apps/dbus-1.4.10 - || ( >=sys-fs/udev-171 >=sys-fs/udev-163[systemd] ) + >=sys-fs/udev-171 >=sys-apps/util-linux-2.19 sys-libs/libcap audit? ( >=sys-process/audit-2 ) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest deleted file mode 100644 index eff168c..0000000 --- a/sys-fs/udev/Manifest +++ /dev/null @@ -1,101 +0,0 @@ -AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b -AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9 -AUX 136/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 -AUX 136/udev-mount.initd 2706 RMD160 f4fbeece9ceb018f19eeeb120e801902b1d7f693 SHA1 466ab0c05ac331acbb8a61d9fb7ff2997c5dee06 SHA256 b35cd8ac15b4db70ed4882a2c5f3823fad5983b8ecb3b45a9977a6e45b62d2a7 -AUX 136/udev-postmount.initd 683 RMD160 a316cd40d8739b9d9a65939dd32a496e8e7786c8 SHA1 0e0faeaf82bd241a895a457669cda1b8cb8c7d77 SHA256 14094a6f8ff2644cab9b20e52e339f002ecaf35a2cb6565d972030a4e43cb3ca -AUX 136/udev-start.sh 1345 RMD160 c1b4aac1a52da1eac79f3b6a2ccb6e7036a81fdf SHA1 a8d889f3a1ed216d64affa79a99446611899b16d SHA256 5a56cb63ab5fec4f5393eca944d734bab1373bc2a75dcee6b202f86570541414 -AUX 136/udev-stop.sh 237 RMD160 dea1f6d7525e792484c3d2c31d36e8b4d78ebda8 SHA1 72174a2e5e6be2133b2e5f68e477d0fa342b46ce SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d -AUX 136/udev.confd 1764 RMD160 255afed98d59675108bc96e1639f9b7e8baed4b3 SHA1 19f465c7140818860ce5031e85118d48544c3629 SHA256 6918ce2ad61a7998088e1628e5bd1b59a9082cdb89dc23b1385f641d8a59cdb6 -AUX 136/udev.initd 5799 RMD160 6991713e7b6339396da68348d3a938e993fc83c1 SHA1 58fb5eb0dbe31d334d744fc3bdfcf70c56dd81d9 SHA256 615d4d8c4e806f89bb94348f9959c1e034447485ac313b41af2e05d384eb991e -AUX 147/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b -AUX 147/shell-compat-addon.sh 1706 RMD160 feda3632aacbda824df059313a9b62fbfa2d087e SHA1 a0fa72aa1129b4abcdb8fc4060313c7bc432c20c SHA256 481eb655c58cbb65163a2ac58022b730d1e720d4066273358627a4fe98c52a1f -AUX 147/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 -AUX 147/udev-mount.initd 2889 RMD160 1b547d5c97e2aa02a2a0ef003f274dc0b15d4d6c SHA1 5ccc13d7bc23f8a1a78d3e0fcd21c95844933bbd SHA256 d8d21b393b5bcc6069baa9eb52ec073d265c8cd75d7ffa87828fe98b9c693fbc -AUX 147/udev-postmount.initd 803 RMD160 a68a0ff59442f365f2866f689852f3fdf24413b3 SHA1 76ce7396310d7e352f4e359ccf11991aaf1fda6d SHA256 c3d74922672363f6fe7e2caa2f349448b060ee491eaea2cdefae44800297caa8 -AUX 147/udev-start.sh 1355 RMD160 e2347f29110ca50ce2e608b4f7f62b2054da590e SHA1 8f4dcac83e64253bb32b8fc78f84e46114510b3f SHA256 2721826100e6180d0f76c3a15b14fe0c7d2d09af3dc16f88ceeca312abf1abb6 -AUX 147/udev-stop.sh 237 RMD160 dea1f6d7525e792484c3d2c31d36e8b4d78ebda8 SHA1 72174a2e5e6be2133b2e5f68e477d0fa342b46ce SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d -AUX 147/udev.confd 1764 RMD160 255afed98d59675108bc96e1639f9b7e8baed4b3 SHA1 19f465c7140818860ce5031e85118d48544c3629 SHA256 6918ce2ad61a7998088e1628e5bd1b59a9082cdb89dc23b1385f641d8a59cdb6 -AUX 147/udev.initd 6382 RMD160 4476082e89c0a63897bc40ca98ebdf779f75cee4 SHA1 08c6dbe4e8530ec32ee732950b919bfcb833408e SHA256 60a27b041ddb1b69c81b20bfa92df14780fd99fe97edd60c0a178da14c181517 -AUX 151-r4/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b -AUX 151-r4/shell-compat-addon.sh 1706 RMD160 feda3632aacbda824df059313a9b62fbfa2d087e SHA1 a0fa72aa1129b4abcdb8fc4060313c7bc432c20c SHA256 481eb655c58cbb65163a2ac58022b730d1e720d4066273358627a4fe98c52a1f -AUX 151-r4/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 -AUX 151-r4/udev-mount.initd 3027 RMD160 ea148758a48ddb47ee51d838e1d7feb64e31aeb5 SHA1 f6b5ec06037dab5a794406ac6b66bad11b1ca5d7 SHA256 12d79f025cd55feda9510fe9097fdcd90fc6096f19e03b495ab0f6b8566c3ec4 -AUX 151-r4/udev-postmount.initd 806 RMD160 f781fe6bec2136c9d3fcebb675d0467712f98620 SHA1 aba49d7183144e1a547bad48c538d2bd73dce723 SHA256 a7ab507f285a058c9cde2f96dc0aa2bb77db3f94897a4ba21b42404dc6606267 -AUX 151-r4/udev-start.sh 1355 RMD160 e2347f29110ca50ce2e608b4f7f62b2054da590e SHA1 8f4dcac83e64253bb32b8fc78f84e46114510b3f SHA256 2721826100e6180d0f76c3a15b14fe0c7d2d09af3dc16f88ceeca312abf1abb6 -AUX 151-r4/udev-stop.sh 237 RMD160 dea1f6d7525e792484c3d2c31d36e8b4d78ebda8 SHA1 72174a2e5e6be2133b2e5f68e477d0fa342b46ce SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d -AUX 151-r4/udev.confd 2002 RMD160 2c8171f4426cac028fbde55c768e784ff379e3b0 SHA1 e6b360334e7ca599d7bf9f4fc7f8ea58b77e256f SHA256 b797379b93d03accf9d8b65f0c4a2f26de1c634c8ba7846f3238dea9211aa153 -AUX 151-r4/udev.initd 6719 RMD160 83b6021bddf695293608184098fa0c5f6be1a891 SHA1 467bb84c90d948d241687fea3c454b23ffadf498 SHA256 f10b0a19e29f4a78f68d30454549010f680ed64140fcd3bccb6e0788ff489818 -AUX 156/40-gentoo.rules 349 RMD160 e2f86db2c5839ce73b08006889c0aa6ff9ba1185 SHA1 14db0043b408e10c8c2e7e4d03de96c10208e5c9 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea -AUX 156/90-network.rules 280 RMD160 5e6877819613fbdb0d0c7e8d042e3f3f91247c29 SHA1 25f5abe857a1fe21fa3b035bb88f3d3f81e77b4e SHA256 ba1628cf8df2780546fb158946f1591ef4e4177186d44705e27e71b417590b55 -AUX 156/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b -AUX 156/shell-compat-addon.sh 1706 RMD160 feda3632aacbda824df059313a9b62fbfa2d087e SHA1 a0fa72aa1129b4abcdb8fc4060313c7bc432c20c SHA256 481eb655c58cbb65163a2ac58022b730d1e720d4066273358627a4fe98c52a1f -AUX 156/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60 -AUX 156/udev-mount.initd 2707 RMD160 a3df877e1e2714e145f0afd757ffa334349ecce4 SHA1 03663c6d7e7d016de0aab6372446e6c1401c7c04 SHA256 88eea31f0444a4081fe295457403ab62231870321e6610bf91c252b04b0d262a -AUX 156/udev-postmount.initd 836 RMD160 d8af7958ce0a7d4ab447af440b8f44ae3c72b094 SHA1 167b12c800deae56265308873bf1c94dc222f5b9 SHA256 09ca6b3bf15c6783aabb8820ad5d045ff962eb0cbb9a061874e387eec1f11756 -AUX 156/udev-start.sh 1355 RMD160 e2347f29110ca50ce2e608b4f7f62b2054da590e SHA1 8f4dcac83e64253bb32b8fc78f84e46114510b3f SHA256 2721826100e6180d0f76c3a15b14fe0c7d2d09af3dc16f88ceeca312abf1abb6 -AUX 156/udev-stop.sh 237 RMD160 dea1f6d7525e792484c3d2c31d36e8b4d78ebda8 SHA1 72174a2e5e6be2133b2e5f68e477d0fa342b46ce SHA256 1dbdaa45b9f1e54faba9d153a93c0043aabe5b51270c233d3a5e48a6c1d20a1d -AUX 156/udev.confd 2003 RMD160 a6dc9af31a3a1374e7c71547c0d57c6c0698f9c5 SHA1 c6e8473952249ab48f1018f675904ff513b1bda1 SHA256 e47efd1839066b0ce38b84b6c881329363b2135f963327b704ad6bb8b4ea4cba -AUX 156/udev.initd 6672 RMD160 fb95bfb9a4bd9a5746026ed1749a661198669f58 SHA1 6bc6a5efd9a98c6b16e3d4294973c24d672be88d SHA256 87eab976bc6e35070eb2b08e2d92e6c18e5a0fafe7f18bef5c115bed8221f2b5 -AUX 161/40-gentoo.rules 349 RMD160 e2f86db2c5839ce73b08006889c0aa6ff9ba1185 SHA1 14db0043b408e10c8c2e7e4d03de96c10208e5c9 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea -AUX 161/90-network.rules 280 RMD160 5e6877819613fbdb0d0c7e8d042e3f3f91247c29 SHA1 25f5abe857a1fe21fa3b035bb88f3d3f81e77b4e SHA256 ba1628cf8df2780546fb158946f1591ef4e4177186d44705e27e71b417590b55 -AUX 161/shell-compat-KV.sh 1012 RMD160 613bddb3853cb0e60ff9a115bc65b331e4937a2e SHA1 42fc07fbc8cd4ac8c7379a5d6df2a2db044d185b SHA256 ea54899826853c2df53beff744b3401c4676dc9667a48abed72bed4e6b9f3f7c -AUX 161/shell-compat-addon.sh 1706 RMD160 92dd4c3b6fdbdd3ccbaf6d0ae21a6a472f0b4026 SHA1 1a41e6c59c48e795ca946a78dc17d00c579481cb SHA256 4883b9ab305372a93b1c344d1a586cc6e7d1177b8a0e697869ec9f62c84ca6c2 -AUX 161/udev-dev-tarball.initd 2579 RMD160 9c9b80177683ae5a3f5f63668c7a6455025a7431 SHA1 6f46db14fbbace485e80eb1c989929ec5674b04a SHA256 950c8c25b4dccafbd703bcfe5073750e4ce07bdce74305c7c22b9ed3cc8b161c -AUX 161/udev-mount.initd 2707 RMD160 76afc0c54e3c185bc4a1220872c374ddfe3bb933 SHA1 ee1be53df5da7e7db7f0a009d8eb3236bc3c2baf SHA256 e7509016546307ce08703921086a5531d19da709e1f8f5217042f3c5e54dd847 -AUX 161/udev-postmount.initd 835 RMD160 228f7e0e9f42ef0eeb5053610e0d2dd998d053b4 SHA1 8bf6b0d590c629e9698a5856e9eb2fc7f03728ff SHA256 40d8af9bdd0b41289494fea21766783bc2ae99e90af71b0fda3affddc5789d35 -AUX 161/udev-start.sh 1355 RMD160 dee6ec04573d9b91fdd8aaf772cd4e665b859b6e SHA1 84f73cd4acf69592f3ce7050c9b8ed8fd5d03486 SHA256 92cd1683dd12690994d129fbea9b7e6c63e016959622bac496634f5624dcfe38 -AUX 161/udev-stop.sh 237 RMD160 453c91a97f6b8410e8452d87f27b96970b3521b7 SHA1 72dbec362ab56d9e74c780d73ffc954250608416 SHA256 6b0f6a04cd881fc4baefbeccfa52d7c9db0396a7d0ff178373cb730189b9f84f -AUX 161/udev.confd 2003 RMD160 a6dc9af31a3a1374e7c71547c0d57c6c0698f9c5 SHA1 c6e8473952249ab48f1018f675904ff513b1bda1 SHA256 e47efd1839066b0ce38b84b6c881329363b2135f963327b704ad6bb8b4ea4cba -AUX 161/udev.initd 6672 RMD160 03e40f4d1de94a275b72a2a5c2f2614c66b8bed4 SHA1 34040e5fbb03d6e7e3f6f4d85a73998b3be648d6 SHA256 1a308d57e6e0fc9e2ca4cdcc4dcdce66c61facfa0675403b0fbbfd89dae067fe -AUX 164/40-gentoo.rules 349 RMD160 e2f86db2c5839ce73b08006889c0aa6ff9ba1185 SHA1 14db0043b408e10c8c2e7e4d03de96c10208e5c9 SHA256 5d618b899475925ceccc330b6a738644aedd582d039f0cc404502637351347ea -AUX 164/90-network.rules 280 RMD160 5e6877819613fbdb0d0c7e8d042e3f3f91247c29 SHA1 25f5abe857a1fe21fa3b035bb88f3d3f81e77b4e SHA256 ba1628cf8df2780546fb158946f1591ef4e4177186d44705e27e71b417590b55 -AUX 164/shell-compat-KV.sh 1012 RMD160 613bddb3853cb0e60ff9a115bc65b331e4937a2e SHA1 42fc07fbc8cd4ac8c7379a5d6df2a2db044d185b SHA256 ea54899826853c2df53beff744b3401c4676dc9667a48abed72bed4e6b9f3f7c -AUX 164/shell-compat-addon.sh 1706 RMD160 92dd4c3b6fdbdd3ccbaf6d0ae21a6a472f0b4026 SHA1 1a41e6c59c48e795ca946a78dc17d00c579481cb SHA256 4883b9ab305372a93b1c344d1a586cc6e7d1177b8a0e697869ec9f62c84ca6c2 -AUX 164/udev-dev-tarball.initd 2579 RMD160 9c9b80177683ae5a3f5f63668c7a6455025a7431 SHA1 6f46db14fbbace485e80eb1c989929ec5674b04a SHA256 950c8c25b4dccafbd703bcfe5073750e4ce07bdce74305c7c22b9ed3cc8b161c -AUX 164/udev-mount.initd 2707 RMD160 76afc0c54e3c185bc4a1220872c374ddfe3bb933 SHA1 ee1be53df5da7e7db7f0a009d8eb3236bc3c2baf SHA256 e7509016546307ce08703921086a5531d19da709e1f8f5217042f3c5e54dd847 -AUX 164/udev-postmount.initd 1279 RMD160 d1b0e355ece627013f853c7411ab03fffdec2fd7 SHA1 01a647771c5b17daac2bff70bd0c998a6bf61dce SHA256 90762e488887c488e28a4687c370dfb69302d36aa2b9b164c57059b182a15bca -AUX 164/udev-start.sh 1355 RMD160 dee6ec04573d9b91fdd8aaf772cd4e665b859b6e SHA1 84f73cd4acf69592f3ce7050c9b8ed8fd5d03486 SHA256 92cd1683dd12690994d129fbea9b7e6c63e016959622bac496634f5624dcfe38 -AUX 164/udev-stop.sh 237 RMD160 453c91a97f6b8410e8452d87f27b96970b3521b7 SHA1 72dbec362ab56d9e74c780d73ffc954250608416 SHA256 6b0f6a04cd881fc4baefbeccfa52d7c9db0396a7d0ff178373cb730189b9f84f -AUX 164/udev.confd 2003 RMD160 a6dc9af31a3a1374e7c71547c0d57c6c0698f9c5 SHA1 c6e8473952249ab48f1018f675904ff513b1bda1 SHA256 e47efd1839066b0ce38b84b6c881329363b2135f963327b704ad6bb8b4ea4cba -AUX 164/udev.initd 6672 RMD160 03e40f4d1de94a275b72a2a5c2f2614c66b8bed4 SHA1 34040e5fbb03d6e7e3f6f4d85a73998b3be648d6 SHA256 1a308d57e6e0fc9e2ca4cdcc4dcdce66c61facfa0675403b0fbbfd89dae067fe -AUX blacklist-110 854 RMD160 6cb0acd91dad5c86c47b41f06f74a8529de08b8e SHA1 aa2c3c8340517053151ee687d76d4de05e28ac51 SHA256 438020f3499a2e10a19ba8d3fe7d567572322093ea878e8c18336b067442bcdd -AUX blacklist-146 950 RMD160 cc53bfcd2c56bca3cd65b745db80a821122b5c82 SHA1 bdfc5e83d17cef31b6f98546040e1ddf39af3795 SHA256 12d60698be657c9c5b40c8cb6c3649d02f8d8c8f05d63dab7c8bee0a30c339c4 -AUX modprobe-114.sh 2106 RMD160 7b40f1d0c7e41aa51100c99d1b4accafe9309f00 SHA1 d8d3a6b047a416bf4a80a9dde6eddbcc1e7abb1b SHA256 acfff1be773352f71b7e68ec12aafa113150f76ecb1daa03088842d449df9d6b -AUX modprobe-115.sh 2280 RMD160 effe6766adfff5733d396dbffe00827e61280c5b SHA1 dd9331410db47ce8cfb5ab2d9af8d420905313d6 SHA256 22ab8b9f68bfe6d0acb8d2aec70870700ca03ab80341734cbd059c680473739f -AUX move_tmp_persistent_rules-112-r1.sh 646 RMD160 462b7836fc1492491e8e67de9301acb05cef847e SHA1 32b1cf96cfa55193c7b7e82640296fc11e7e8031 SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400 -AUX net-104-r10.sh 719 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d SHA1 baa060c99d7c38c26bcc629ee9844319bd886647 SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee -AUX net-118-r1.sh 861 RMD160 44335ca0bf482757683fcaf014d2b9072c8fa10c SHA1 7729b61627b71038928310b27099bd02175825df SHA256 90054aeda808a7b82ff08d7185a198f89f9a0b5ad0e3ff8e92940fdec4b7d68a -AUX net-130-r1.sh 865 RMD160 0025caa63b4b57bac9d6d47a285e8593fd47fc21 SHA1 299b89d6fa04d700e31bf0b8a8eebf90cc8a6640 SHA256 54897b58aba92d9765e8da4349ad777f9d8328bf94922d28cb3210ee0664a6a4 -AUX pnp-aliases 537 RMD160 e0144801b7b9c77eb4897692678b75a661723725 SHA1 8276e2dd1a3be1aa2343797b3f9906606d58c9ca SHA256 690b32a166d060c1c663030c51d5b2298eb9d314c8cef737373e0b16ed751e99 -AUX shell-compat-118-r2.sh 1050 RMD160 9cffc5b6b1159fcf87a6befbfaaf01a632828d9f SHA1 75b90a518372624a850c045993885104e27728dc SHA256 f3a71925ca6b99a34018150b3280c4990b465aa297de55f7784f90b1fe9b5e6a -AUX shell-compat-118-r3.sh 1554 RMD160 4adb41f34c71704c03d241e291aba4529ee0c43c SHA1 a1bbf28acca0dd3189dba91bc876820364706cd8 SHA256 d5720dd2d572db98320d08572fa1d5f40037697d94e2db6bd7b51ba502fc2876 -AUX udev-110-root-link-1.diff 3412 RMD160 d4a61b2825ec593198c286622b5f9a188bd18e51 SHA1 06869481f097a09244de6ccb28e133ca03515fef SHA256 30e983bb086c40e0935680d46c172b3e737b2ad5bc134070451250ebcf39c8c8 -AUX udev-114-root-link-2.diff 4677 RMD160 47b040b51ed0dc637ff2197373db5173bc59854e SHA1 be6ab3162682b4c4cd922d57d356eee4b35d352e SHA256 d212407420bb46a541e547d59862668745dd8b516b6be6e6619cf967ab2124f9 -AUX udev-122-rules-update.diff 586 RMD160 5b9d086ac57ae282b5cd30eda375fc736b2c1af8 SHA1 91ed560c66a5619c7e6fe411a8802acc31682185 SHA256 1eaa8365efa69445e8a1e95c88f1fd411ed3b3f0b73e3d1c3798f0943c5584a8 -AUX udev-124-cdrom-autoclose-bug.diff 1381 RMD160 7e1ee6fa9f59f2528df7c4b3deb1d8c12332b14b SHA1 04daf04b28f2963d98c2826962de625b4ba4b03e SHA256 260a1bd5ad54c8c484a55a503c7b602518070dcc40c2887bb5ec84a5231bedf9 -AUX udev-124-encoding-overflow.patch 326 RMD160 8f08aa593d93451d67bdbfe0b9ea2d59e7a5947e SHA1 9f476abc669656b2ae55eca244a4cc956525ab39 SHA256 870b7347a57909c27cc5c6c03af0b2cf71f18c07b826f8d2d16ac688430d7d28 -AUX udev-124-netlink-owner-check.patch 1162 RMD160 420a22a2762930479df5c7b609931685bba29a6c SHA1 0fbdd35ad860e9b09d141735757fad0319bd08b3 SHA256 c2354e23c451883ab1597603467caf24e0a6893af4d8a3b86aee2ba98917a45e -AUX udev-141-remove-devfs-names.diff 557 RMD160 c8dbcb0dcc815d78b9f33a6b49290cf21f2b7eee SHA1 5167dc1227e2f07664fad66a24365af192c8ab14 SHA256 9d1d64b41a6ff423fb218a36c56cbdec2d79827741060f39aed2f8ce2d03693f -AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf0399ecf326dc5f975719c SHA1 379bdb522edc45a9d9ed748be84f9087bee5b438 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371 -AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c -AUX udev-164-remove-v4l1.patch 1263 RMD160 6fac54e8ef9810c57065f730e3fcacb0a47f9143 SHA1 491bdba9b141acff68b9cd18b65055d9f7f41b54 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403 -AUX udev-167-revert-disable-all-extras.patch 1281 RMD160 fd62b74bc534aad58690615edc5cbeafcacf3b3e SHA1 3a822ef8b94d5d08cb80546de1b6b5a56b958fea SHA256 fb695c5032f30a2091554db4dcb2713025ffc7e01036e39910421776a54c95d0 -AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c -AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046 -AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268 -AUX udev-start-118-r2.sh 5072 RMD160 24b469dc45b70b6eac82ae3a32f1fb8b0d062c5f SHA1 259ffce13605ad5dd4495926862a1c30ed9c1b51 SHA256 90b6a7616767facf64bcc21563f7333f63633044c24fa56f6ca5647c5b8ee5dc -AUX udev-start-122-r1.sh 5776 RMD160 50d9aa7d13dbbe04b13d85aee785caa3be36bcd4 SHA1 91216ac58a61a4f5c0d73751f773efb3ffecc8e7 SHA256 6590e4a4bc9a56ec3ead0cef1d7727dc565bdc90dccbbd33dcb56b7f320176ad -AUX udev-stop-111-r2.sh 2389 RMD160 a3dcd87b999576f552c3a36f43513c68eabf40dd SHA1 a107387dfe9d0e5bbb470cc89186b49248b4e2a9 SHA256 41f0b053033ceaadf1e9334540c129a879aedb35de88f8aff0b3464009fa04fa -AUX udev-stop-118-r2.sh 2160 RMD160 0c3c40fbe3f931a3a8a41b9bcc98b5d6f6592f45 SHA1 9327cd3f6fd805b198ca7f75dcc839a6ebd04066 SHA256 ebda8f0e744e842b2dc563e58ec9bb18f981c9003a4446fdf95cbbe90df5e62e -AUX udev.conf.post_113 1084 RMD160 00b356c1be30a03d63bb25516d05eb4688642804 SHA1 4a55d0c0b75673f9863f87717978fcd70219119d SHA256 61ad09df9fbfbe382c7bf3c57eed2b546a324815e8c31bd52e1114b5b8e4eb1b -AUX udev.conf.post_114 405 RMD160 9cb36e1c4fad99ed0d37952d54a6508bc3ad6428 SHA1 c01872ed68d8b0183aa7fb7e6c721e4408557347 SHA256 1d1ea52357d6318c9bc9f4b77e1509d700ef7576eb255e9be9112ea94685e6fb -AUX udev.confd 205 RMD160 9a05cf33e0a59d087d647e2aa8b12cd2bea89a3d SHA1 8ed3b9a3a46595e1d7264249f91a645e2bac7968 SHA256 6620d2fba1e76101d67f1b45843f03d62c09089a786b37a8aa8035f1f115d6b6 -AUX udev.initd 1457 RMD160 81d4b42483b578027fce518f19a969a600aa07ce SHA1 609853ec8843b4ddfa18e19c041cc152106ec980 SHA256 8aad04741a9ca4ee9243de642afd9b053b286eaec7d7ae22551c709a0c46c0d3 -AUX write_root_link_rule 1064 RMD160 dae5cc41dc790d34a5d29320fa47411dd45547be SHA1 80e4d5de4b6a08ca263bc55981f2ff8065673eb4 SHA256 3c5b198b0aaf92f88e419f4d11f6e7c5da010d25ccc391b5f4aa600e33825a78 -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-168-gentoo-patchset-v1.tar.bz2 1327 RMD160 a06ccdfcde0a5938ba1dde0c6abd1c7406bba14c SHA1 cac0776b5b448badedef41989b6f4c4bfd3fe575 SHA256 83b4666f1c597ba5aa0226d208dd1360d02812e5d745054f930136294486ec06 -DIST udev-168.tar.bz2 598171 RMD160 a58fc418553bfc208bdc1d33e6798e21d99c5896 SHA1 c5ad16c9a3b9a4317a49f2a091e776d1ac00a8fa SHA256 9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2 -DIST udev-gentoo-scripts-v3.tar.bz2 9534 RMD160 c4d311d241896987c9c24e31feff994fb8a629e5 SHA1 bdf2b5b0f7373c700562b8bfef5d419333ba4408 SHA256 4cae68974f15624f6387252e25cbcd1fcb67c7d4bf37c7cf08656843fcafbc2d -EBUILD udev-168-r2.ebuild 14983 RMD160 669e841e69d79245ce9b5eebe4628a545e120d98 SHA1 365b583d4c23984714debaccede1c350aea1c7d9 SHA256 18b6cce9d810138f4baf9afbcdb07b9350b7f4772ae5b9c60940f8ff8733478d -MISC metadata.xml 447 RMD160 1531d2e197a55761f9cd060fdef43a91658de58a SHA1 78765a9745e6e5ab133adf7610f1370aee1d634a SHA256 c96792a0d72103888c108abc2db8946523bc402db7b1beb496fcbf9535d661de diff --git a/sys-fs/udev/files/136/shell-compat-KV.sh b/sys-fs/udev/files/136/shell-compat-KV.sh deleted file mode 100644 index be74fe4..0000000 --- a/sys-fs/udev/files/136/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/136/shell-compat-addon.sh b/sys-fs/udev/files/136/shell-compat-addon.sh deleted file mode 100644 index 7e684f4..0000000 --- a/sys-fs/udev/files/136/shell-compat-addon.sh +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--quiet" ] && shift - local dir="$1" - - # only check RC_USE_FSTAB on baselayout-1 - yesno "${RC_USE_FSTAB}" || return 1 - - # check if entry is in /etc/fstab - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /etc/fstab) - - "${ret}" - } -fi - - diff --git a/sys-fs/udev/files/136/udev-dev-tarball.initd b/sys-fs/udev/files/136/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4f..0000000 --- a/sys-fs/udev/files/136/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/136/udev-mount.initd b/sys-fs/udev/files/136/udev-mount.initd deleted file mode 100755 index 694b194..0000000 --- a/sys-fs/udev/files/136/udev-mount.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if fstabinfo --quiet /dev; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null - fi - - # make sure it exists - mkdir -p /dev/.udev - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/136/udev-postmount.initd b/sys-fs/udev/files/136/udev-postmount.initd deleted file mode 100755 index 96beb84..0000000 --- a/sys-fs/udev/files/136/udev-postmount.initd +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/136/udev-postmount.initd,v 1.3 2009/02/23 16:30:53 zzam Exp $ - -depend() { - need localmount -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/136/udev-start.sh b/sys-fs/udev/files/136/udev-start.sh deleted file mode 100644 index 8bf098d..0000000 --- a/sys-fs/udev/files/136/udev-start.sh +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# inject into boot runlevel -IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/136/udev-stop.sh b/sys-fs/udev/files/136/udev-stop.sh deleted file mode 100644 index 47e0956..0000000 --- a/sys-fs/udev/files/136/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/136/udev.confd b/sys-fs/udev/files/136/udev.confd deleted file mode 100644 index bffea35..0000000 --- a/sys-fs/udev/files/136/udev.confd +++ /dev/null @@ -1,56 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/136/udev.initd b/sys-fs/udev/files/136/udev.initd deleted file mode 100644 index 563ba98..0000000 --- a/sys-fs/udev/files/136/udev.initd +++ /dev/null @@ -1,246 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local d=/dev/.udev/rules.d bname="$1" onoff="$2" - - if yesno "${onoff}"; then - mkdir -p "$d" - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${d}/${bname}" - else - rm -f "${d}/${bname}" - fi -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevadm trigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --subsystem-match=net - fi - eend $? - - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - # do not display this - better: do only inject it later :) - [ "$svc" = "udev-postmount" ] && continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -inject_postmount_initd() { - if ! mark_service_hotplugged udev-postmount; then - IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - fi - #einfo "Injected udev-postmount service" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start - - display_hotplugged_services - - inject_postmount_initd - - return 0 -} - -_start() -{ - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/147/shell-compat-KV.sh b/sys-fs/udev/files/147/shell-compat-KV.sh deleted file mode 100644 index be74fe4..0000000 --- a/sys-fs/udev/files/147/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/147/shell-compat-addon.sh b/sys-fs/udev/files/147/shell-compat-addon.sh deleted file mode 100644 index c271abf..0000000 --- a/sys-fs/udev/files/147/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/147/udev-dev-tarball.initd b/sys-fs/udev/files/147/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4f..0000000 --- a/sys-fs/udev/files/147/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/147/udev-mount.initd b/sys-fs/udev/files/147/udev-mount.initd deleted file mode 100755 index 179c9f8..0000000 --- a/sys-fs/udev/files/147/udev-mount.initd +++ /dev/null @@ -1,114 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/147/udev-postmount.initd b/sys-fs/udev/files/147/udev-postmount.initd deleted file mode 100755 index 439d1a5..0000000 --- a/sys-fs/udev/files/147/udev-postmount.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/147/udev-postmount.initd,v 1.2 2009/10/20 12:38:14 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/147/udev-start.sh b/sys-fs/udev/files/147/udev-start.sh deleted file mode 100644 index e927e8c..0000000 --- a/sys-fs/udev/files/147/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/147/udev-stop.sh b/sys-fs/udev/files/147/udev-stop.sh deleted file mode 100644 index 47e0956..0000000 --- a/sys-fs/udev/files/147/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/147/udev.confd b/sys-fs/udev/files/147/udev.confd deleted file mode 100644 index bffea35..0000000 --- a/sys-fs/udev/files/147/udev.confd +++ /dev/null @@ -1,56 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/147/udev.initd b/sys-fs/udev/files/147/udev.initd deleted file mode 100644 index 36a7c05..0000000 --- a/sys-fs/udev/files/147/udev.initd +++ /dev/null @@ -1,263 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevadm trigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/151-r4/shell-compat-KV.sh b/sys-fs/udev/files/151-r4/shell-compat-KV.sh deleted file mode 100644 index be74fe4..0000000 --- a/sys-fs/udev/files/151-r4/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/151-r4/shell-compat-addon.sh b/sys-fs/udev/files/151-r4/shell-compat-addon.sh deleted file mode 100644 index c271abf..0000000 --- a/sys-fs/udev/files/151-r4/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/151-r4/udev-dev-tarball.initd b/sys-fs/udev/files/151-r4/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4f..0000000 --- a/sys-fs/udev/files/151-r4/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/151-r4/udev-mount.initd b/sys-fs/udev/files/151-r4/udev-mount.initd deleted file mode 100755 index 4acdf09..0000000 --- a/sys-fs/udev/files/151-r4/udev-mount.initd +++ /dev/null @@ -1,119 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/151-r4/udev-postmount.initd b/sys-fs/udev/files/151-r4/udev-postmount.initd deleted file mode 100755 index 643d5df..0000000 --- a/sys-fs/udev/files/151-r4/udev-postmount.initd +++ /dev/null @@ -1,35 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/151-r4/udev-postmount.initd,v 1.1 2010/05/05 19:35:07 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/151-r4/udev-start.sh b/sys-fs/udev/files/151-r4/udev-start.sh deleted file mode 100644 index e927e8c..0000000 --- a/sys-fs/udev/files/151-r4/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/151-r4/udev-stop.sh b/sys-fs/udev/files/151-r4/udev-stop.sh deleted file mode 100644 index 47e0956..0000000 --- a/sys-fs/udev/files/151-r4/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/151-r4/udev.confd b/sys-fs/udev/files/151-r4/udev.confd deleted file mode 100644 index af75ab3..0000000 --- a/sys-fs/udev/files/151-r4/udev.confd +++ /dev/null @@ -1,63 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Run udevd so that all events are serialized, read more in man udevd at --debug-trace -#udev_trace="YES" - -# Run udevd --debug and write output to /dev/.udev/udev.log -# Should not be kept on as it fills diskspace slowly -#udev_debug="YES" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/151-r4/udev.initd b/sys-fs/udev/files/151-r4/udev.initd deleted file mode 100644 index 92dcdf9..0000000 --- a/sys-fs/udev/files/151-r4/udev.initd +++ /dev/null @@ -1,273 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver nolxc noopenvz - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - local opts="" - yesno "${udev_trace:-no}" && opts="${opts} --debug-trace" - - ebegin "Starting udevd" - if yesno "${udev_debug:-no}"; then - /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log - else - start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts} - fi - - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - udevadm control --property=STARTUP=1 - if yesno "${rc_coldplug}"; then - udevadm trigger --action="add" - else - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --action="add" --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --action="add" --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --property=do_not_run_plug_service= - udevadm control --property=STARTUP= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/156/40-gentoo.rules b/sys-fs/udev/files/156/40-gentoo.rules deleted file mode 100644 index fa99ba9..0000000 --- a/sys-fs/udev/files/156/40-gentoo.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# setting permissions -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - -# dialout devices -KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" - -# sound devices (oss) -SUBSYSTEM=="snd", GROUP="audio" - -# Sony Vaio Jogdial sonypi device -KERNEL=="sonypi", MODE="0666" - diff --git a/sys-fs/udev/files/156/90-network.rules b/sys-fs/udev/files/156/90-network.rules deleted file mode 100644 index 50903af..0000000 --- a/sys-fs/udev/files/156/90-network.rules +++ /dev/null @@ -1,8 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# /etc/udev/rules/90-network.rules: triggering network init-scripts - -# Activate our network if we can -SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start" -SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop" - diff --git a/sys-fs/udev/files/156/shell-compat-KV.sh b/sys-fs/udev/files/156/shell-compat-KV.sh deleted file mode 100644 index be74fe4..0000000 --- a/sys-fs/udev/files/156/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/156/shell-compat-addon.sh b/sys-fs/udev/files/156/shell-compat-addon.sh deleted file mode 100644 index c271abf..0000000 --- a/sys-fs/udev/files/156/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/156/udev-dev-tarball.initd b/sys-fs/udev/files/156/udev-dev-tarball.initd deleted file mode 100755 index 2cdce4f..0000000 --- a/sys-fs/udev/files/156/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/156/udev-mount.initd b/sys-fs/udev/files/156/udev-mount.initd deleted file mode 100755 index e13b9f6..0000000 --- a/sys-fs/udev/files/156/udev-mount.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/156/udev-postmount.initd b/sys-fs/udev/files/156/udev-postmount.initd deleted file mode 100755 index ddfb77f..0000000 --- a/sys-fs/udev/files/156/udev-postmount.initd +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/156/udev-postmount.initd,v 1.1 2010/06/20 19:27:54 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - printf "" > "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - einfo "Doing udev cleanups" - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/156/udev-start.sh b/sys-fs/udev/files/156/udev-start.sh deleted file mode 100644 index e927e8c..0000000 --- a/sys-fs/udev/files/156/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/156/udev-stop.sh b/sys-fs/udev/files/156/udev-stop.sh deleted file mode 100644 index 47e0956..0000000 --- a/sys-fs/udev/files/156/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/156/udev.confd b/sys-fs/udev/files/156/udev.confd deleted file mode 100644 index 7c3d3eb..0000000 --- a/sys-fs/udev/files/156/udev.confd +++ /dev/null @@ -1,64 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Add extra command line options to udevd, use with care -# udevd --help for possible values -#udev_opts="" - -# Run udevd --debug and write output to /dev/.udev/udev.log -# Should not be kept on as it fills diskspace slowly -#udev_debug="YES" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/156/udev.initd b/sys-fs/udev/files/156/udev.initd deleted file mode 100644 index 19cec1e..0000000 --- a/sys-fs/udev/files/156/udev.initd +++ /dev/null @@ -1,272 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver nolxc noopenvz - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - local opts="${udev_opts}" - - ebegin "Starting udevd" - if yesno "${udev_debug:-no}"; then - /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log - else - start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts} - fi - - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - udevadm control --property=STARTUP=1 - if yesno "${rc_coldplug}"; then - udevadm trigger --action="add" - else - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --action="add" --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --action="add" --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --property=do_not_run_plug_service= - udevadm control --property=STARTUP= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/161/40-gentoo.rules b/sys-fs/udev/files/161/40-gentoo.rules deleted file mode 100644 index fa99ba9..0000000 --- a/sys-fs/udev/files/161/40-gentoo.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# setting permissions -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - -# dialout devices -KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" - -# sound devices (oss) -SUBSYSTEM=="snd", GROUP="audio" - -# Sony Vaio Jogdial sonypi device -KERNEL=="sonypi", MODE="0666" - diff --git a/sys-fs/udev/files/161/90-network.rules b/sys-fs/udev/files/161/90-network.rules deleted file mode 100644 index 50903af..0000000 --- a/sys-fs/udev/files/161/90-network.rules +++ /dev/null @@ -1,8 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# /etc/udev/rules/90-network.rules: triggering network init-scripts - -# Activate our network if we can -SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start" -SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop" - diff --git a/sys-fs/udev/files/161/shell-compat-KV.sh b/sys-fs/udev/files/161/shell-compat-KV.sh deleted file mode 100644 index ce92e71..0000000 --- a/sys-fs/udev/files/161/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/161/shell-compat-addon.sh b/sys-fs/udev/files/161/shell-compat-addon.sh deleted file mode 100644 index efe7726..0000000 --- a/sys-fs/udev/files/161/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/161/udev-dev-tarball.initd b/sys-fs/udev/files/161/udev-dev-tarball.initd deleted file mode 100644 index 7d5a6b7..0000000 --- a/sys-fs/udev/files/161/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/161/udev-mount.initd b/sys-fs/udev/files/161/udev-mount.initd deleted file mode 100644 index 3e4f884..0000000 --- a/sys-fs/udev/files/161/udev-mount.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/161/udev-postmount.initd b/sys-fs/udev/files/161/udev-postmount.initd deleted file mode 100644 index 33a412f..0000000 --- a/sys-fs/udev/files/161/udev-postmount.initd +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/161/udev-postmount.initd,v 1.1 2010/08/24 18:41:29 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - printf "" 2>/dev/null >"$1"/.test.$$ && rm "$1"/.test.$$ -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - einfo "Doing udev cleanups" - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/161/udev-start.sh b/sys-fs/udev/files/161/udev-start.sh deleted file mode 100644 index a85d0c3..0000000 --- a/sys-fs/udev/files/161/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/161/udev-stop.sh b/sys-fs/udev/files/161/udev-stop.sh deleted file mode 100644 index 784e5d5..0000000 --- a/sys-fs/udev/files/161/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/161/udev.confd b/sys-fs/udev/files/161/udev.confd deleted file mode 100644 index 7c3d3eb..0000000 --- a/sys-fs/udev/files/161/udev.confd +++ /dev/null @@ -1,64 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Add extra command line options to udevd, use with care -# udevd --help for possible values -#udev_opts="" - -# Run udevd --debug and write output to /dev/.udev/udev.log -# Should not be kept on as it fills diskspace slowly -#udev_debug="YES" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/161/udev.initd b/sys-fs/udev/files/161/udev.initd deleted file mode 100644 index 23fc39c..0000000 --- a/sys-fs/udev/files/161/udev.initd +++ /dev/null @@ -1,272 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver nolxc noopenvz - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - local opts="${udev_opts}" - - ebegin "Starting udevd" - if yesno "${udev_debug:-no}"; then - /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log - else - start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts} - fi - - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - udevadm control --property=STARTUP=1 - if yesno "${rc_coldplug}"; then - udevadm trigger --action="add" - else - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --action="add" --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --action="add" --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --property=do_not_run_plug_service= - udevadm control --property=STARTUP= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/164/40-gentoo.rules b/sys-fs/udev/files/164/40-gentoo.rules deleted file mode 100644 index fa99ba9..0000000 --- a/sys-fs/udev/files/164/40-gentoo.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# setting permissions -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - -# dialout devices -KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" - -# sound devices (oss) -SUBSYSTEM=="snd", GROUP="audio" - -# Sony Vaio Jogdial sonypi device -KERNEL=="sonypi", MODE="0666" - diff --git a/sys-fs/udev/files/164/90-network.rules b/sys-fs/udev/files/164/90-network.rules deleted file mode 100644 index 50903af..0000000 --- a/sys-fs/udev/files/164/90-network.rules +++ /dev/null @@ -1,8 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# /etc/udev/rules/90-network.rules: triggering network init-scripts - -# Activate our network if we can -SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start" -SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop" - diff --git a/sys-fs/udev/files/164/shell-compat-KV.sh b/sys-fs/udev/files/164/shell-compat-KV.sh deleted file mode 100644 index ce92e71..0000000 --- a/sys-fs/udev/files/164/shell-compat-KV.sh +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - diff --git a/sys-fs/udev/files/164/shell-compat-addon.sh b/sys-fs/udev/files/164/shell-compat-addon.sh deleted file mode 100644 index efe7726..0000000 --- a/sys-fs/udev/files/164/shell-compat-addon.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# functions that may not be defined, but are used by the udev-start and udev-stop addon -# used by baselayout-1 and openrc before version 0.4.0 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# mountinfo <path> -# check if some filesystem is mounted at mountpoint <path> -# -# return value: -# 0 filesystem is mounted at <path> -# 1 no filesystem is mounted exactly at <path> -if ! cmd_exist mountinfo; then - mountinfo() { - [ "$1" = "-q" ] && shift - local dir="$1" - - # check if entry is in /proc/mounts - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /proc/mounts) - - "${ret}" - } -fi - -# does not exist in baselayout-1, does exist in openrc -# -# used syntax: fstabinfo --mount /dev -# it should mount /dev if an entry exists in /etc/fstab -# -# return value: -# 0 mount succeeded -# 1 mount failed or no entry exists -# -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--mount" ] || return 1 - local dir="$2" - - # RC_USE_FSTAB does only exist in baselayout-1 - # this emulation is only needed on bl-1, so check always - yesno "${RC_USE_FSTAB}" || return 1 - - # no need to check fstab, mount does this already for us - - # try mounting - better first check fstab and then mount without surpressing errors - mount -n "${dir}" 2>/dev/null - return $? - } -fi diff --git a/sys-fs/udev/files/164/udev-dev-tarball.initd b/sys-fs/udev/files/164/udev-dev-tarball.initd deleted file mode 100644 index 7d5a6b7..0000000 --- a/sys-fs/udev/files/164/udev-dev-tarball.initd +++ /dev/null @@ -1,95 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Maintain a tarball of not udev managed device nodes" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -device_tarball=/lib/udev/state/devices.tar.bz2 - -depend() { - if [ -f /etc/init.d/sysfs ]; then - need udev-mount - fi -} - -start() -{ - _start -} - -_start() { - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -stop() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tmp_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tmp_tarball}" - - if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] - then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevadm info --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - diff --git a/sys-fs/udev/files/164/udev-mount.initd b/sys-fs/udev/files/164/udev-mount.initd deleted file mode 100644 index 3e4f884..0000000 --- a/sys-fs/udev/files/164/udev-mount.initd +++ /dev/null @@ -1,107 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount tmpfs on /dev" -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -# get_KV and KV_to_int -. /lib/udev/shell-compat-KV.sh - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN%') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel %KV_MIN% and newer." - return 1 - fi - - yesno "${unreliable_kernel_warning:-yes}" || return 0 - - if [ $(get_KV) -lt $(KV_to_int '%KV_MIN_RELIABLE%') ]; then - ewarn "You need at least Linux kernel %KV_MIN_RELIABLE% for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - if mountinfo -q /dev; then - einfo "/dev is already mounted" - return 0 - fi - - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if ! fstabinfo --mount /dev; then - # we mount devtmpfs if supported - local fs=tmpfs - grep -qs devtmpfs /proc/filesystems && fs=devtmpfs - - # Some devices require exec, Bug #92921 - mount -n -t "$fs" -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console, /dev/tty and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1 - [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 - ${HAVE_SELINUX} && restorecon /dev/null - - # so udev can add its start-message to dmesg - [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - ${HAVE_SELINUX} && restorecon -R /dev >/dev/null - return 0 -} - - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - _start -} - -_start() -{ - check_kernel || return 1 - mount_dev_directory || return 1 - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ]; then - HAVE_SELINUX=true - restorecon /dev > /selinux/null - else - HAVE_SELINUX=false - fi - - # make sure it exists - mkdir -p /dev/.udev /dev/.udev/rules.d - - seed_dev - - return 0 -} diff --git a/sys-fs/udev/files/164/udev-postmount.initd b/sys-fs/udev/files/164/udev-postmount.initd deleted file mode 100644 index 12a30f6..0000000 --- a/sys-fs/udev/files/164/udev-postmount.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/164/udev-postmount.initd,v 1.1 2010/10/30 13:53:54 zzam Exp $ - -depend() { - need localmount - after dbus # for trigger failed -} - -dir_writeable() -{ - touch "$1"/.test.$$ 2>/dev/null && rm "$1"/.test.$$ -} - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() { - # only continue if rules-directory is writable - dir_writeable /etc/udev/rules.d || return 0 - - local file dest - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - einfo "Doing udev cleanups" - - # Run the events that failed at first udev trigger - udevadm trigger --type=failed -v - - # store persistent-rules that got created while booting - # when / was still read-only - store_persistent_rules -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/164/udev-start.sh b/sys-fs/udev/files/164/udev-start.sh deleted file mode 100644 index a85d0c3..0000000 --- a/sys-fs/udev/files/164/udev-start.sh +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/conf.d/udev ] && . /etc/conf.d/udev - -. /lib/udev/shell-compat-addon.sh - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - # This check is likely to get false positives due to some multilib stuff, - # but that should not matter, as this can only happen on old openrc versions - # no longer available as ebuilds. - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -start_initd() -{ - ( - . /etc/init.d/"$1" - _start - ) -} - -# set it as openrc does -RC_BOOTLEVEL=${BOOTLEVEL:-default} -RC_DEFAULTLEVEL=${DEFAULTLEVEL:-default} - -# mount tmpfs on /dev -start_initd udev-mount || exit 1 - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -# this is no longer needed as of openrc-0.4.0 -touch /dev/.rcsysinit - -# load device tarball -start_initd udev-dev-tarball - -# run udevd -start_initd udev || exit 1 - -compat_volume_nodes - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/164/udev-stop.sh b/sys-fs/udev/files/164/udev-stop.sh deleted file mode 100644 index 784e5d5..0000000 --- a/sys-fs/udev/files/164/udev-stop.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# for function yesno -. /lib/udev/shell-compat-addon.sh - -# store device tarball -( - . /etc/init.d/udev-dev-tarball - stop -) - -exit 0 diff --git a/sys-fs/udev/files/164/udev.confd b/sys-fs/udev/files/164/udev.confd deleted file mode 100644 index 7c3d3eb..0000000 --- a/sys-fs/udev/files/164/udev.confd +++ /dev/null @@ -1,64 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - -# Disable adding new rules for persistent-cd -# Disabling this will stop new cdrom devices to appear -# as /dev/{cdrom,cdrw,dvd,dvdrw} -persistent_cd_disable="no" - -# Set to "yes" if you want to save /dev to a tarball on shutdown -# and restore it on startup. This is useful if you have a lot of -# custom device nodes that udev does not handle/know about. -# -# As this option is fragile, we recommend you -# to create your devices in /lib/udev/devices. -# These will be copied to /dev on boot. -#rc_device_tarball="NO" - -# udev can trigger coldplug events which cause services to start and -# kernel modules to be loaded. -# Services are deferred to start in the boot runlevel. -# Set rc_coldplug="NO" if you don't want this. -# If you want module coldplugging but not coldplugging of services then you -# can disable service coldplugging in baselayout/openrc config files. -# The setting is named different in different versions. -# in /etc/rc.conf: rc_hotplug="!*" or -# in /etc/conf.d/rc: rc_plug_services="!*" -#rc_coldplug="YES" - - - - -# Expert options: - -# Disable warning about unreliable kernel/udev combination -#unreliable_kernel_warning="no" - -# Timeout in seconds to wait for processing of uevents at boot. -# There should be no need to change this. -#udev_settle_timeout="60" - -# Add extra command line options to udevd, use with care -# udevd --help for possible values -#udev_opts="" - -# Run udevd --debug and write output to /dev/.udev/udev.log -# Should not be kept on as it fills diskspace slowly -#udev_debug="YES" - -# Run udevadmin monitor to get a log of all events -# in /dev/.udev/udevmonitor.log -#udev_monitor="YES" - -# Keep udevmonitor running after populating /dev. -#udev_monitor_keep_running="no" - -# Set cmdline options for udevmonitor. -# could be some of --env --kernel --udev -#udev_monitor_opts="--env" - diff --git a/sys-fs/udev/files/164/udev.initd b/sys-fs/udev/files/164/udev.initd deleted file mode 100644 index 23fc39c..0000000 --- a/sys-fs/udev/files/164/udev.initd +++ /dev/null @@ -1,272 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Run udevd and create the device-nodes" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - if yesno "${rc_device_tarball:-no}"; then - need sysfs udev-mount udev-dev-tarball - else - need sysfs udev-mount - fi - before checkfs fsck - - # udev does not work inside vservers - keyword novserver nolxc noopenvz - fi -} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -rules_disable_switch() -{ - # this function disables rules files - # by creating new files with the same name - # in a temp rules directory with higher priority - local f=/dev/.udev/rules.d/"$1" bname="$1" onoff="$2" - - if yesno "${onoff}"; then - echo "# This file disables ${bname} due to /etc/conf.d/udev" \ - > "${f}" - else - rm -f "${f}" - fi -} - -# only called on openrc -is_service_enabled() { - local svc="$1" - - [ ! -e "/etc/init.d/${svc}" ] && return 1 - - [ -e "/etc/runlevels/${RC_BOOTLEVEL}/${svc}" ] && return 0 - [ -e "/etc/runlevels/${RC_DEFAULTLEVEL}/${svc}" ] && return 0 - return 1 -} - -check_openrc_net() -{ - local f=/dev/.udev/rules.d/90-network.rules - is_service_enabled network || return 0 - - # disable network hotplugging - echo "# This file disables network hotplug events calling old-style openrc net scripts" >> "${f}" - echo "# as we use new-style network init script /etc/init.d/network" >> "${f}" -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix 2>/dev/null - fi - local opts="${udev_opts}" - - ebegin "Starting udevd" - if yesno "${udev_debug:-no}"; then - /sbin/udevd --daemon ${opts} --debug 2>/dev/.udev/udev.log - else - start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts} - fi - - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - udevadm control --property=STARTUP=1 - if yesno "${rc_coldplug}"; then - udevadm trigger --action="add" - else - # Do not run any init-scripts, Bug #206518 - udevadm control --property=do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --action="add" --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --action="add" --subsystem-match=net - fi - eend $? - - # we can speed up booting under these conditions: - # * using devtmpfs so kernel creates device nodes for us - # * only using kernel created device nodes at boot (in /etc/fstab and elsewhere) - # - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=${udev_settle_timeout:-60} - eend $? - - udevadm control --property=do_not_run_plug_service= - udevadm control --property=STARTUP= - return 0 -} - -# for debugging -start_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - udevmonitor_log=/dev/.udev/udevmonitor.log - udevmonitor_pid=/dev/.udev/udevmonitor.pid - - einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events" - start-stop-daemon --start --stdout "${udevmonitor_log}" \ - --make-pidfile --pidfile "${udevmonitor_pid}" \ - --background --exec /sbin/udevadm -- monitor ${udev_monitor_opts} -} - -stop_udevmonitor() -{ - yesno "${udev_monitor:-no}" || return 0 - - if yesno "${udev_monitor_keep_running:-no}"; then - ewarn "udev: udevmonitor is still running and writing into ${udevmonitor_log}" - else - einfo "udev: Stopping udevmonitor: Log is in ${udevmonitor_log}" - start-stop-daemon --stop --pidfile "${udevmonitor_pid}" --exec /sbin/udevadm - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - -start() -{ - # do not run this on old baselayout where udev-addon gets loaded - if [ ! -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - check_openrc_net - _start - - display_hotplugged_services - - return 0 -} - -_start() -{ - if [ ! -e /etc/runlevels/${RC_DEFAULTLEVEL:-default}/udev-postmount ]; then - ewarn "You should add udev-postmount service to your default runlevel." - fi - - root_link - rules_disable_switch 75-persistent-net-generator.rules "${persistent_net_disable:-no}" - rules_disable_switch 75-cd-aliases-generator.rules ${persistent_cd_disable:-no} - - disable_hotplug_agent - start_udevd || cleanup - start_udevmonitor - populate_dev || cleanup - - check_persistent_net - - check_udev_works || cleanup - stop_udevmonitor - - return 0 -} - -stop() { - ebegin "Stopping udevd" - start-stop-daemon --stop --exec /sbin/udevd - eend $? -} - diff --git a/sys-fs/udev/files/blacklist-110 b/sys-fs/udev/files/blacklist-110 deleted file mode 100644 index 1a1ee58..0000000 --- a/sys-fs/udev/files/blacklist-110 +++ /dev/null @@ -1,26 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist <name of module>" - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Autoloading eth1394 most of the time re-orders your network -# interfaces, and with buggy kernel 2.6.21, udev persistent-net -# is not able to rename these devices, so you get eth?_rename devices -# plus an exceeded 30sec boot timeout -blacklist eth1394 - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - diff --git a/sys-fs/udev/files/blacklist-146 b/sys-fs/udev/files/blacklist-146 deleted file mode 100644 index 90bc234..0000000 --- a/sys-fs/udev/files/blacklist-146 +++ /dev/null @@ -1,29 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist <name of module>" - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Autoloading eth1394 most of the time re-orders your network -# interfaces, and with buggy kernel 2.6.21, udev persistent-net -# is not able to rename these devices, so you get eth?_rename devices -# plus an exceeded 30sec boot timeout -blacklist eth1394 - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - -# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded -#blacklist usblp - diff --git a/sys-fs/udev/files/modprobe-114.sh b/sys-fs/udev/files/modprobe-114.sh deleted file mode 100755 index 8e5d062..0000000 --- a/sys-fs/udev/files/modprobe-114.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -# Do not continue for non-modular kernel - Bug #168322 -[ ! -f /proc/modules ] && exit 0 - -if [ -e /dev/.udev_populate ]; then - # Enable verbose while called from udev-addon-start - . /dev/.udev_populate - - if [ -c "${CONSOLE}" ]; then - # redirect stdin/out/err - exec <${CONSOLE} >${CONSOLE} 2>/${CONSOLE} - fi -fi - -# set default if not present in udev.conf -implicitly_blacklist_modules_autoload="yes" -MODPROBE=/sbin/modprobe - -. /etc/init.d/functions.sh -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - - -# Create a lock file for the current module. -lock_modprobe() { - [ -e /dev/.udev/ ] || return 0 - - MODPROBE_LOCK="/dev/.udev/.lock-modprobe-${MODNAME}" - - retry=20 - while ! mkdir "$MODPROBE_LOCK" 2> /dev/null; do - if [ $retry -eq 0 ]; then - ewarn "Could not lock modprobe ${MODNAME}!" - return 1 - fi - sleep 1 - retry=$(($retry - 1)) - done - return 0 -} - -unlock_modprobe() { - [ "$MODPROBE_LOCK" ] || return 0 - rmdir "$MODPROBE_LOCK" || true -} - -cleanup_exit() { - unlock_modprobe - exit "$@" -} - -# Get normalized names only with _ -MODLIST=$("${MODPROBE}" -q -i --show-depends "${@}" 2>/dev/null \ - | sed -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" -e 's|-|_|g') - -# exit if you have no modules to load -[ -z "${MODLIST}" ] && exit 0 -for m in ${MODLIST}; do - MODNAME=$m -done - - -lock_modprobe - -if [ -d /sys/module/"${MODNAME}" ]; then - # already loaded - cleanup_exit 0 -fi - -# build regex to match module name written with either - or _ -MOD_REGEX="$(echo "${MODNAME}"|sed -e 's#_#[-_]#g')" - -# check for blacklisting -if [ -f /etc/modprobe.conf ]; then - if grep -q '^blacklist.*[[:space:]]'"${MOD_REGEX}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then - # module blacklisted - cleanup_exit 0 - fi -fi - -if [ "$implicitly_blacklist_modules_autoload" = "yes" -a -f "${MODULES_AUTOLOAD_FILE}" ]; then - if grep -q "^${MOD_REGEX}"'\([[:space:]]\|$\)' "${MODULES_AUTOLOAD_FILE}"; then - # module implictly blacklisted - # as present in modules.autoload, Bug 184833 - cleanup_exit 0 - fi -fi - -# now do real loading -einfo " udev loading module ${MODNAME}" -"${MODPROBE}" -q "${@}" >/dev/null 2>/dev/null -unlock_modprobe - diff --git a/sys-fs/udev/files/modprobe-115.sh b/sys-fs/udev/files/modprobe-115.sh deleted file mode 100755 index 0425d62..0000000 --- a/sys-fs/udev/files/modprobe-115.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Do not continue for non-modular kernel - Bug #168322 -[ ! -f /proc/modules ] && exit 0 - -if [ -e /dev/.udev_populate ]; then - # Enable verbose while called from udev-addon-start - . /dev/.udev_populate - - if [ -c "${CONSOLE}" ]; then - # redirect stdin/out/err - exec <${CONSOLE} >${CONSOLE} 2>/${CONSOLE} - fi -fi - -# set default if not present in udev.conf -implicitly_blacklist_modules_autoload="yes" -MODPROBE=/sbin/modprobe - -. /etc/init.d/functions.sh -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - - -# Create a lock file for the current module. -lock_modprobe() { - [ -e /dev/.udev/ ] || return 0 - - MODPROBE_LOCK="/dev/.udev/.lock-modprobe-${MODNAME}" - - retry=20 - while ! mkdir "$MODPROBE_LOCK" 2> /dev/null; do - if [ $retry -eq 0 ]; then - ewarn "Could not lock modprobe ${MODNAME}!" - return 1 - fi - sleep 1 - retry=$(($retry - 1)) - done - return 0 -} - -unlock_modprobe() { - [ "$MODPROBE_LOCK" ] || return 0 - rmdir "$MODPROBE_LOCK" || true - MODPROBE_LOCK="" -} - -load_module() { - # Get normalized names only with _ - local MODLIST=$("${MODPROBE}" -q -i --show-depends "${@}" 2>/dev/null \ - | sed -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" -e 's|-|_|g') - - # exit if you have no modules to load - [ -z "${MODLIST}" ] && return 0 - local m - for m in ${MODLIST}; do - MODNAME=$m - done - - lock_modprobe - - if [ -d /sys/module/"${MODNAME}" ]; then - # already loaded - unlock_modprobe - return 0 - fi - - # build regex to match module name written with either - or _ - MOD_REGEX="$(echo "${MODNAME}"|sed -e 's#_#[-_]#g')" - - # check for blacklisting - if [ -f /etc/modprobe.conf ]; then - if grep -q '^blacklist.*[[:space:]]'"${MOD_REGEX}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then - # module blacklisted - unlock_modprobe - return 0 - fi - fi - - if [ "$implicitly_blacklist_modules_autoload" = "yes" -a -f "${MODULES_AUTOLOAD_FILE}" ]; then - if grep -q "^${MOD_REGEX}"'\([[:space:]]\|$\)' "${MODULES_AUTOLOAD_FILE}"; then - # module implictly blacklisted - # as present in modules.autoload, Bug 184833 - unlock_modprobe - return 0 - fi - fi - - # now do real loading - einfo " udev loading module ${MODNAME}" - "${MODPROBE}" -q "${@}" >/dev/null 2>/dev/null - unlock_modprobe -} - -while [ -n "${1}" ]; do - case "${1}" in - --all|-a) ;; - *) load_module "${1}" ;; - esac - shift -done - diff --git a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh b/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh deleted file mode 100755 index 1a02597..0000000 --- a/sys-fs/udev/files/move_tmp_persistent_rules-112-r1.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -. /etc/init.d/functions.sh - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() { - local file dest - - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - ebegin "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" && rm -f "$file" - eend $? "Failed moving persistent rules!" - done -} - -store_persistent_rules - -# vim:ts=4 diff --git a/sys-fs/udev/files/net-104-r10.sh b/sys-fs/udev/files/net-104-r10.sh deleted file mode 100755 index f9f51aa..0000000 --- a/sys-fs/udev/files/net-104-r10.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# net.sh: udev external RUN script -# -# Copyright 2007 Roy Marples <uberlord@gentoo.org> -# Distributed under the terms of the GNU General Public License v2 - -IFACE=$1 -ACTION=$2 - -SCRIPT=/etc/init.d/net.$IFACE - -# ignore interfaces that are registered after being "up" (?) -case ${IFACE} in - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) - exit 0 ;; -esac - -if [ ! -x "${SCRIPT}" ] ; then - logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" - exit 1 -fi - -# If we're stopping then sleep for a bit in-case a daemon is monitoring -# the interface. This to try and ensure we stop after they do. -[ "${ACTION}" == "stop" ] && sleep 2 - -IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sys-fs/udev/files/net-118-r1.sh b/sys-fs/udev/files/net-118-r1.sh deleted file mode 100755 index bb8b2d6..0000000 --- a/sys-fs/udev/files/net-118-r1.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# net.sh: udev external RUN script -# -# Copyright 2007 Roy Marples <uberlord@gentoo.org> -# Distributed under the terms of the GNU General Public License v2 - -IFACE=$1 -ACTION=$2 - -SCRIPT=/etc/init.d/net.$IFACE - -# ignore interfaces that are registered after being "up" (?) -case ${IFACE} in - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) - exit 0 ;; -esac - -# stop here if coldplug is disabled, Bug #206518 -if [ "${do_not_run_plug_service}" = 1 ]; then - exit 0 -fi - -if [ ! -x "${SCRIPT}" ] ; then - #do not flood log with messages, bug #205687 - #logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" - exit 1 -fi - -# If we're stopping then sleep for a bit in-case a daemon is monitoring -# the interface. This to try and ensure we stop after they do. -[ "${ACTION}" == "stop" ] && sleep 2 - -IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sys-fs/udev/files/net-130-r1.sh b/sys-fs/udev/files/net-130-r1.sh deleted file mode 100755 index af61870..0000000 --- a/sys-fs/udev/files/net-130-r1.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# net.sh: udev external RUN script -# -# Copyright 2007 Roy Marples <uberlord@gentoo.org> -# Distributed under the terms of the GNU General Public License v2 - -IFACE=$1 -ACTION=$2 - -SCRIPT=/etc/init.d/net.$IFACE - -# ignore interfaces that are registered after being "up" (?) -case ${IFACE} in - ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*|br*) - exit 0 ;; -esac - -# stop here if coldplug is disabled, Bug #206518 -if [ "${do_not_run_plug_service}" = 1 ]; then - exit 0 -fi - -if [ ! -x "${SCRIPT}" ] ; then - #do not flood log with messages, bug #205687 - #logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" - exit 1 -fi - -# If we're stopping then sleep for a bit in-case a daemon is monitoring -# the interface. This to try and ensure we stop after they do. -[ "${ACTION}" == "stop" ] && sleep 2 - -IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sys-fs/udev/files/pnp-aliases b/sys-fs/udev/files/pnp-aliases deleted file mode 100644 index 3675fbb..0000000 --- a/sys-fs/udev/files/pnp-aliases +++ /dev/null @@ -1,17 +0,0 @@ -# /etc/modprobe.d/pnp-aliases -# -# These aliases are used by this udev-rule: -# SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'" -# -# They should help to autoload drivers used by various pnp-devices -# (if not blacklisted somewhere else) -# -alias pnp:dPNP0510 irtty-sir -alias pnp:dPNP0511 irtty-sir -alias pnp:dPNP0700 floppy -alias pnp:dPNP0800 pcspkr -alias pnp:dPNP0b00 rtc -alias pnp:dPNP0303 atkbd -alias pnp:dPNP0f13 psmouse -alias pnp:dPNPb02f analog - diff --git a/sys-fs/udev/files/shell-compat-118-r2.sh b/sys-fs/udev/files/shell-compat-118-r2.sh deleted file mode 100644 index 0b91bf5..0000000 --- a/sys-fs/udev/files/shell-compat-118-r2.sh +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - -if ! cmd_exist fstabinfo; then - # we only query /dev, so ignore all args - fstabinfo() { - yesno "${RC_USE_FSTAB}" - } -fi - diff --git a/sys-fs/udev/files/shell-compat-118-r3.sh b/sys-fs/udev/files/shell-compat-118-r3.sh deleted file mode 100644 index 479dd9d..0000000 --- a/sys-fs/udev/files/shell-compat-118-r3.sh +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -cmd_exist() -{ - type "$1" >/dev/null 2>&1 -} - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist yesno; then - yesno() { - [ -z "$1" ] && return 1 - case "$1" in - yes|Yes|YES) return 0 ;; - esac - return 1 - } -fi - -# does exist in baselayout-1 -# does not exist in openrc, but is added by openrc-ebuild since some time -if ! cmd_exist KV_to_int; then - KV_to_int() { - [ -z $1 ] && return 1 - - local x=${1%%-*} - local KV_MAJOR=${x%%.*} - x=${x#*.} - local KV_MINOR=${x%%.*} - x=${x#*.} - local KV_MICRO=${x%%.*} - local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} )) - - # We make version 2.2.0 the minimum version we will handle as - # a sanity check ... if its less, we fail ... - [ "${KV_int}" -lt 131584 ] && return 1 - - echo "${KV_int}" - } -fi - -# same as KV_to_int -if ! cmd_exist get_KV; then - _RC_GET_KV_CACHE="" - get_KV() { - [ -z "${_RC_GET_KV_CACHE}" ] \ - && _RC_GET_KV_CACHE="$(uname -r)" - - echo "$(KV_to_int "${_RC_GET_KV_CACHE}")" - - return $? - } -fi - -# does not exist in baselayout-1, does exist in openrc -if ! cmd_exist fstabinfo; then - fstabinfo() { - [ "$1" = "--quiet" ] && shift - local dir="$1" - - # only check RC_USE_FSTAB on baselayout-1 - yesno "${RC_USE_FSTAB}" || return 1 - - # check if entry is in /etc/fstab - local ret=$(gawk 'BEGIN { found="false"; } - $1 ~ "^#" { next } - $2 == "'$dir'" { found="true"; } - END { print found; } - ' /etc/fstab) - - "${ret}" - } -fi - - diff --git a/sys-fs/udev/files/udev-110-root-link-1.diff b/sys-fs/udev/files/udev-110-root-link-1.diff deleted file mode 100644 index c8813d1..0000000 --- a/sys-fs/udev/files/udev-110-root-link-1.diff +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/extras/root_link/Makefile b/extras/root_link/Makefile -new file mode 100644 -index 0000000..76b475d ---- /dev/null -+++ b/extras/root_link/Makefile -@@ -0,0 +1,69 @@ -+# Makefile for udev extra invoked from the udev main Makefile -+# -+# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org> -+# -+# Released under the GNU General Public License, version 2. -+# -+ -+PROG = get_dir_major_minor -+OBJ = -+HEADERS = -+GEN_HEADERS = -+MAN_PAGES = -+ -+prefix = -+etcdir = ${prefix}/etc -+sbindir = ${prefix}/sbin -+usrbindir = ${prefix}/usr/bin -+usrsbindir = ${prefix}/usr/sbin -+libudevdir = ${prefix}/lib/udev -+mandir = ${prefix}/usr/share/man -+configdir = ${etcdir}/udev/ -+ -+INSTALL = install -c -+INSTALL_PROGRAM = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+INSTALL_SCRIPT = ${INSTALL} -+ -+all: $(PROG) $(MAN_PAGES) -+.PHONY: all -+.DEFAULT: all -+ -+%.o: %.c $(GEN_HEADERS) -+ $(E) " CC " $@ -+ $(Q) $(CC) -c $(CFLAGS) $< -o $@ -+ -+$(PROG): %: $(HEADERS) %.o $(OBJS) -+ $(E) " LD " $@ -+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS) -+ -+# man pages -+%.8: %.xml -+ $(E) " XMLTO " $@ -+ $(Q) xmlto man $? -+.PRECIOUS: %.8 -+ -+clean: -+ $(E) " CLEAN " -+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS) -+.PHONY: clean -+ -+install-bin: all -+ $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) -+.PHONY: install-bin -+ -+uninstall-bin: -+ - rm $(DESTDIR)$(libudevdir)/$(PROG) -+.PHONY: uninstall-bin -+ -+install-man: -+ @echo "Please create a man page for this tool." -+.PHONY: install-man -+ -+uninstall-man: -+ @echo "Please create a man page for this tool." -+.PHONY: uninstall-man -+ -+install-config: -+ @echo "no config file to install" -+.PHONY: install-config -diff --git a/extras/root_link/get_dir_major_minor.c b/extras/root_link/get_dir_major_minor.c -new file mode 100644 -index 0000000..1e39411 ---- /dev/null -+++ b/extras/root_link/get_dir_major_minor.c -@@ -0,0 +1,48 @@ -+// print out major/minor nr of the device the supplied dir -+// is mounted on -+// -+// Author: Matthias Schwarzott <zzam@gentoo.org> -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+ -+#include <stdio.h> -+#include <stdlib.h> -+ -+// Getting major/minor -+#include <sys/sysmacros.h> -+int main(int argc, char **argv) -+{ -+ struct stat stat_buf; -+ unsigned int dev_major=0, dev_minor=0; -+ dev_t dev; -+ -+ if (argc != 2) { -+ printf("Usage:\n"); -+ printf(" get_dir_major_minor <directory>\n"); -+ return EXIT_FAILURE; -+ } -+ -+ if (stat(argv[1], &stat_buf) < 0) { -+ perror("stat"); -+ return EXIT_FAILURE; -+ } -+ -+ dev = stat_buf.st_dev; -+ -+ dev_major = gnu_dev_major(dev); -+ dev_minor = gnu_dev_minor(dev); -+ -+ -+ if (dev_major == 0) { -+ fprintf(stderr, "Major number is 0.\n"); -+ return EXIT_FAILURE; -+ } else -+ printf("%d %d\n", -+ dev_major, -+ dev_minor); -+ -+ return EXIT_SUCCESS; -+} -+ -diff --git a/extras/root_link/print_root_link_rule.sh b/extras/root_link/print_root_link_rule.sh -new file mode 100755 -index 0000000..c33f290 ---- /dev/null -+++ b/extras/root_link/print_root_link_rule.sh -@@ -0,0 +1,13 @@ -+#!/bin/sh -+ -+PROG=/lib/udev/print_dir_major_minor -+[ -x "${PROG}" ] && DEV=$(/lib/udev/print_dir_major_minor /) -+if [ $? == 0 ]; then -+ MAJOR="${DEV##* }" -+ MINOR="${DEV%% *}" -+ -+ echo "# Created by print_root_link_rule" -+ echo "# This rule should create /dev/root as link to real root device." -+ echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$MAJOR\", ENV{MINOR}==\"$MINOR\", SYMLINK+=\"root\"" -+fi -+ diff --git a/sys-fs/udev/files/udev-114-root-link-2.diff b/sys-fs/udev/files/udev-114-root-link-2.diff deleted file mode 100644 index 5bd61a2..0000000 --- a/sys-fs/udev/files/udev-114-root-link-2.diff +++ /dev/null @@ -1,164 +0,0 @@ -diff -ruN udev-git/extras/root_link/get_dir_major_minor.c udev-git-try/extras/root_link/get_dir_major_minor.c ---- udev-git/extras/root_link/get_dir_major_minor.c 1970-01-01 01:00:00.000000000 +0100 -+++ udev-git-try/extras/root_link/get_dir_major_minor.c 2007-08-16 16:08:30.000000000 +0200 -@@ -0,0 +1,52 @@ -+// print out major/minor nr of the device the supplied dir -+// is mounted on -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of the GNU General Public License as published by the -+// Free Software Foundation version 2 of the License. -+// -+// (c) 2007 Matthias Schwarzott <zzam@gentoo.org> -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+ -+#include <stdio.h> -+#include <stdlib.h> -+ -+// Getting major/minor -+#include <sys/sysmacros.h> -+int main(int argc, char **argv) -+{ -+ struct stat stat_buf; -+ unsigned int dev_major=0, dev_minor=0; -+ dev_t dev; -+ -+ if (argc != 2) { -+ printf("Usage:\n"); -+ printf(" get_dir_major_minor <directory>\n"); -+ return EXIT_FAILURE; -+ } -+ -+ if (stat(argv[1], &stat_buf) < 0) { -+ perror("stat"); -+ return EXIT_FAILURE; -+ } -+ -+ dev = stat_buf.st_dev; -+ -+ dev_major = gnu_dev_major(dev); -+ dev_minor = gnu_dev_minor(dev); -+ -+ -+ if (dev_major == 0) { -+ fprintf(stderr, "Major number is 0.\n"); -+ return EXIT_FAILURE; -+ } else -+ printf("%d %d\n", -+ dev_major, -+ dev_minor); -+ -+ return EXIT_SUCCESS; -+} -+ -diff -ruN udev-git/extras/root_link/Makefile udev-git-try/extras/root_link/Makefile ---- udev-git/extras/root_link/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ udev-git-try/extras/root_link/Makefile 2007-08-16 15:52:01.000000000 +0200 -@@ -0,0 +1,70 @@ -+# Makefile for udev extra invoked from the udev main Makefile -+# -+# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org> -+# -+# Released under the GNU General Public License, version 2. -+# -+ -+PROG = get_dir_major_minor -+OBJ = -+HEADERS = -+GEN_HEADERS = -+MAN_PAGES = -+ -+prefix = -+etcdir = ${prefix}/etc -+sbindir = ${prefix}/sbin -+usrbindir = ${prefix}/usr/bin -+usrsbindir = ${prefix}/usr/sbin -+libudevdir = ${prefix}/lib/udev -+mandir = ${prefix}/usr/share/man -+configdir = ${etcdir}/udev/ -+ -+INSTALL = install -c -+INSTALL_PROGRAM = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+INSTALL_SCRIPT = ${INSTALL} -+ -+all: $(PROG) $(MAN_PAGES) -+.PHONY: all -+.DEFAULT: all -+ -+%.o: %.c $(GEN_HEADERS) -+ $(E) " CC " $@ -+ $(Q) $(CC) -c $(CFLAGS) $< -o $@ -+ -+$(PROG): %: $(HEADERS) %.o $(OBJS) -+ $(E) " LD " $@ -+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS) -+ -+# man pages -+%.8: %.xml -+ $(E) " XMLTO " $@ -+ $(Q) xmlto man $? -+.PRECIOUS: %.8 -+ -+clean: -+ $(E) " CLEAN " -+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS) -+.PHONY: clean -+ -+install-bin: all -+ $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG) -+ $(INSTALL_PROGRAM) -D write_root_link_rule $(DESTDIR)$(libudevdir)/ -+.PHONY: install-bin -+ -+uninstall-bin: -+ - rm $(DESTDIR)$(libudevdir)/$(PROG) -+.PHONY: uninstall-bin -+ -+install-man: -+ @echo "Please create a man page for this tool." -+.PHONY: install-man -+ -+uninstall-man: -+ @echo "Please create a man page for this tool." -+.PHONY: uninstall-man -+ -+install-config: -+ @echo "no config file to install" -+.PHONY: install-config -diff -ruN udev-git/extras/root_link/write_root_link_rule udev-git-try/extras/root_link/write_root_link_rule ---- udev-git/extras/root_link/write_root_link_rule 1970-01-01 01:00:00.000000000 +0100 -+++ udev-git-try/extras/root_link/write_root_link_rule 2007-08-16 16:12:23.000000000 +0200 -@@ -0,0 +1,30 @@ -+#!/bin/sh -+# -+# This script should run before doing udevtrigger at boot. -+# It will create a rule matching the device directory / is on, and -+# creating /dev/root symlink pointing on its device node. -+# -+# This is especially useful for hal looking at /proc/mounts containing -+# a line listing /dev/root as device: -+# /dev/root / reiserfs rw 0 0 -+# -+# This program is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation version 2 of the License. -+# -+# (c) 2007 Matthias Schwarzott <zzam@gentoo.org> -+ -+PROG=/lib/udev/get_dir_major_minor -+[ -x "${PROG}" ] && DEV=$(${PROG} "/") -+if [ $? = 0 ]; then -+ MAJOR="${DEV% *}" -+ MINOR="${DEV#* }" -+ -+ [ -d /dev/.udev/rules.d ] || mkdir -p /dev/.udev/rules.d -+ RULES=/dev/.udev/rules.d/10-root-link.rules -+ -+ echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}" -+ echo "# This rule should create /dev/root as link to real root device." >> "${RULES}" -+ echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$MAJOR\", ENV{MINOR}==\"$MINOR\", SYMLINK+=\"root\"" >> "${RULES}" -+fi -+ diff --git a/sys-fs/udev/files/udev-122-rules-update.diff b/sys-fs/udev/files/udev-122-rules-update.diff deleted file mode 100644 index cd4b7ca..0000000 --- a/sys-fs/udev/files/udev-122-rules-update.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: udev-git/etc/udev/gentoo/65-permissions.rules -=================================================================== ---- udev-git.orig/etc/udev/gentoo/65-permissions.rules -+++ udev-git/etc/udev/gentoo/65-permissions.rules -@@ -15,7 +15,7 @@ KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht - SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660" - - # dialout devices --KERNEL=="ippp*|isdn*|dcbri*|capi*", GROUP="uucp" -+KERNEL=="ippp*|isdn*|dcbri*|capi*|rfcomm*|ttyACM[0-9]*", GROUP="uucp" - KERNEL=="pilot", GROUP="uucp" - - # sound devices (sound=alsa, snd=oss) diff --git a/sys-fs/udev/files/udev-124-cdrom-autoclose-bug.diff b/sys-fs/udev/files/udev-124-cdrom-autoclose-bug.diff deleted file mode 100644 index 165c06c..0000000 --- a/sys-fs/udev/files/udev-124-cdrom-autoclose-bug.diff +++ /dev/null @@ -1,27 +0,0 @@ -commit f755fd5657b619fd27160ad202fc5d773d096e9c -Author: Kay Sievers <kay.sievers@vrfy.org> -Date: Sat Aug 2 10:26:48 2008 +0200 - - rules: run vol_id on opticals only if media is found - - Opening an optical drive device node without O_NONBLOCK autocloses the - tray, we run vol_id on every media change by kernel emitted "change" - events, which can make it hard to change the media when the tray closes - immediatey again.:) We check for cdrom_id to indicate an existing track, - if no media is found, we will not open the device with vol_id. - - Thanks to Christian Krause and DavidZ for debugging and testing. - -diff --git a/etc/udev/rules.d/60-persistent-storage.rules b/etc/udev/rules.d/60-persistent-storage.rules -index 5ae0c7f..097e864 100644 ---- a/etc/udev/rules.d/60-persistent-storage.rules -+++ b/etc/udev/rules.d/60-persistent-storage.rules -@@ -52,6 +52,8 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA - - # skip unpartitioned removable media devices from drivers which do not send "change" events - ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" -+# skip optical drives without media -+ENV{DEVTYPE}=="disk", KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}!="?*", GOTO="persistent_storage_end" - - # import filesystem metadata - IMPORT{program}="vol_id --export $tempnode" diff --git a/sys-fs/udev/files/udev-124-encoding-overflow.patch b/sys-fs/udev/files/udev-124-encoding-overflow.patch deleted file mode 100644 index 1a60142..0000000 --- a/sys-fs/udev/files/udev-124-encoding-overflow.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/udev_utils_string.c b/udev_utils_string.c -index e3dc137..0995da5 100644 ---- a/udev_utils_string.c -+++ b/udev_utils_string.c -@@ -52,7 +52,7 @@ void remove_trailing_chars(char *path, char c) - - size_t path_encode(char *s, size_t len) - { -- char t[(len * 3)+1]; -+ char t[(len * 4)+1]; - size_t i, j; - - t[0] = '\0'; diff --git a/sys-fs/udev/files/udev-124-netlink-owner-check.patch b/sys-fs/udev/files/udev-124-netlink-owner-check.patch deleted file mode 100644 index 4159637..0000000 --- a/sys-fs/udev/files/udev-124-netlink-owner-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruNp udev-124~/udevd.c udev-124/udevd.c ---- udev-124~/udevd.c 2008-06-11 22:24:30.000000000 -0700 -+++ udev-124/udevd.c 2009-04-08 16:30:06.000000000 -0700 -@@ -753,16 +753,34 @@ static struct udevd_uevent_msg *get_netl - struct udevd_uevent_msg *msg; - int bufpos; - ssize_t size; -+ struct sockaddr_nl snl; -+ struct msghdr smsg; -+ struct iovec iov; - static char buffer[UEVENT_BUFFER_SIZE+512]; - char *pos; - -- size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0); -+ iov.iov_base = buffer; -+ iov.iov_len = sizeof(buffer); -+ -+ memset(&smsg, 0x00, sizeof(struct msghdr)); -+ smsg.msg_name = &snl; -+ smsg.msg_namelen = sizeof(struct sockaddr_nl); -+ smsg.msg_iov = &iov; -+ smsg.msg_iovlen = 1; -+ -+ size = recvmsg(uevent_netlink_sock, &smsg, 0); - if (size < 0) { - if (errno != EINTR) - err("unable to receive kernel netlink message: %s\n", strerror(errno)); - return NULL; - } - -+ if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) { -+ info("ignored netlink message from invalid group/sender %d/%d\n", -+ snl.nl_groups, snl.nl_pid); -+ return NULL; -+ } -+ - if ((size_t)size > sizeof(buffer)-1) - size = sizeof(buffer)-1; - buffer[size] = '\0'; diff --git a/sys-fs/udev/files/udev-141-remove-devfs-names.diff b/sys-fs/udev/files/udev-141-remove-devfs-names.diff deleted file mode 100644 index 56501f8..0000000 --- a/sys-fs/udev/files/udev-141-remove-devfs-names.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/rules/gentoo/40-gentoo.rules b/rules/gentoo/40-gentoo.rules -index 4751b51..91a7545 100644 ---- a/rules/gentoo/40-gentoo.rules -+++ b/rules/gentoo/40-gentoo.rules -@@ -1,11 +1,5 @@ - # do not edit this file, it will be overwritten on update - --# old devfs path, removing this could break systems --# Bug 195839 --KERNEL=="md[0-9]*", SYMLINK+="md/%n" --KERNEL=="loop[0-9]*", SYMLINK+="loop/%n" --KERNEL=="ram[0-9]*", SYMLINK+="rd/%n" -- - # keep devices after driver unload - KERNEL=="ppp", OPTIONS+="ignore_remove" - KERNEL=="tun", OPTIONS+="ignore_remove" diff --git a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff deleted file mode 100644 index 7690f6b..0000000 --- a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c -index 8f70be4..16455de 100644 ---- a/extras/firmware/firmware.c -+++ b/extras/firmware/firmware.c -@@ -149,6 +149,7 @@ int main(int argc, char **argv) - - util_path_encode(firmware, fwencpath, sizeof(fwencpath)); - util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL); -+ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); - - if (fwfile == NULL) { - int err; -@@ -166,6 +167,7 @@ int main(int argc, char **argv) - udev_selinux_resetfscreatecon(udev); - } while (err == -ENOENT); - rc = 2; -+ set_loading(udev, loadpath, "-1"); - goto exit; - } - -@@ -176,7 +178,6 @@ int main(int argc, char **argv) - if (unlink(misspath) == 0) - util_delete_path(udev, misspath); - -- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); - set_loading(udev, loadpath, "1"); - - util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL); - diff --git a/sys-fs/udev/files/udev-151-readd-hd-rules.diff b/sys-fs/udev/files/udev-151-readd-hd-rules.diff deleted file mode 100644 index 53e99b0..0000000 --- a/sys-fs/udev/files/udev-151-readd-hd-rules.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules -index 132a680..a3e8e3c 100644 ---- a/extras/cdrom_id/60-cdrom_id.rules -+++ b/extras/cdrom_id/60-cdrom_id.rules -@@ -2,4 +2,4 @@ - - # import optical drive properties - ACTION=="add|change", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", \ -- KERNEL=="sr[0-9]*|xvd*", IMPORT{program}="cdrom_id --export $tempnode" -+ KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]|xvd*", IMPORT{program}="cdrom_id --export $tempnode" -diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules -index f8556d1..ba07079 100644 ---- a/rules/rules.d/50-udev-default.rules -+++ b/rules/rules.d/50-udev-default.rules -@@ -77,9 +77,12 @@ SUBSYSTEM=="block", GROUP="disk" - - # floppy - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" -+SUBSYSTEM=="block", KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k" -+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" - - # cdrom - SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" -+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" - SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" - KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" - KERNEL=="pktcdvd", GROUP="cdrom" -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index 89041a9..6f12a9a 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -12,12 +12,21 @@ SUBSYSTEM!="block", GOTO="persistent_storage_end" - # skip rules for inappropriate block devices - KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end" - -+# never access non-cdrom removable ide devices, the drivers are causing event loops on open() -+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end" -+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" -+ - # ignore partitions that span the entire disk - TEST=="whole_disk", GOTO="persistent_storage_end" - - # for partitions import parent information - ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" - -+# by-id (hardware serial number) -+KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -+KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}" -+KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}-part%n" -+ - # USB devices use their own serial number - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" - # ATA devices with their own "ata" kernel subsystem diff --git a/sys-fs/udev/files/udev-164-remove-v4l1.patch b/sys-fs/udev/files/udev-164-remove-v4l1.patch deleted file mode 100644 index 288da53..0000000 --- a/sys-fs/udev/files/udev-164-remove-v4l1.patch +++ /dev/null @@ -1,47 +0,0 @@ -Author: Kay Sievers <kay.sievers@vrfy.org> -Date: Tue Feb 15 17:24:32 2011 +0100 - - v4l_id: kill the v4l1 ioctl - - Recent kernels do not have v4l1 anymore. - -diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c -index d530a6d..21cb328 100644 ---- a/extras/v4l_id/v4l_id.c -+++ b/extras/v4l_id/v4l_id.c -@@ -28,7 +28,6 @@ - #include <sys/types.h> - #include <sys/time.h> - #include <sys/ioctl.h> --#include <linux/videodev.h> - #include <linux/videodev2.h> - - int main (int argc, char *argv[]) -@@ -39,7 +38,6 @@ int main (int argc, char *argv[]) - }; - int fd; - char *device; -- struct video_capability v1cap; - struct v4l2_capability v2cap; - - while (1) { -@@ -82,19 +80,6 @@ int main (int argc, char *argv[]) - if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) - printf("radio:"); - printf("\n"); -- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { -- printf("ID_V4L_VERSION=1\n"); -- printf("ID_V4L_PRODUCT=%s\n", v1cap.name); -- printf("ID_V4L_CAPABILITIES=:"); -- if ((v1cap.type & VID_TYPE_CAPTURE) > 0) -- printf("capture:"); -- if ((v1cap.type & VID_TYPE_OVERLAY) > 0) -- printf("video_overlay:"); -- if (v1cap.audios > 0) -- printf("audio:"); -- if ((v1cap.type & VID_TYPE_TUNER) > 0) -- printf("tuner:"); -- printf("\n"); - } - - close (fd); diff --git a/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch b/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch deleted file mode 100644 index dff195a..0000000 --- a/sys-fs/udev/files/udev-167-revert-disable-all-extras.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 9bb54267a1483e8f3b2de352c7be433f625e5606 -Author: Martin Pitt <martin.pitt@ubuntu.com> -Date: Thu Mar 31 19:23:19 2011 +0200 - - Revert "Do not build extras with --disable-extras" - - This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a. - - We do want to build some extras, just not the ones with extra dependencies. - Thanks to Juergen Daubert for pointing this out. - -diff --git a/Makefile.am b/Makefile.am -index df70bf7..2c20f46 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -225,7 +225,6 @@ dist_udevrules_DATA += \ - extras/rule_generator/75-cd-aliases-generator.rules \ - extras/rule_generator/75-persistent-net-generator.rules - --if ENABLE_EXTRAS - # ------------------------------------------------------------------------------ - # firmware - firmware loading - # ------------------------------------------------------------------------------ -@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la - libexec_PROGRAMS += extras/v4l_id/v4l_id - dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules - --endif # ENABLE_EXTRAS -- - # ------------------------------------------------------------------------------ - # qemu -- qemu/kvm guest tweaks - # ------------------------------------------------------------------------------ diff --git a/sys-fs/udev/files/udev-postmount-initd-111-r2 b/sys-fs/udev/files/udev-postmount-initd-111-r2 deleted file mode 100755 index 6421f84..0000000 --- a/sys-fs/udev/files/udev-postmount-initd-111-r2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev-postmount-initd-111-r2,v 1.1 2007/05/25 13:51:07 zzam Exp $ - -depend() { - need localmount -} - -start() { - # check if this system uses udev - [ -d /dev/.udev/ ] || return 0 - - # store persistent-rules that got created while booting - # when / was still read-only - /lib/udev/move_tmp_persistent_rules.sh -} - -stop() { - : -} - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-start-113-r2.sh b/sys-fs/udev/files/udev-start-113-r2.sh deleted file mode 100644 index f8cd448..0000000 --- a/sys-fs/udev/files/udev-start-113-r2.sh +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -tmpfs_size="10M" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -get_modules_autoload_file() { - # code copied from /etc/init.d/modules - - # Should not fail if kernel do not have module - # support compiled in ... - [ ! -f /proc/modules -o "${RC_SYS}" = "VPS" ] && return 0 - - local KV=$(uname -r) - local KV_MAJOR=${KV%%.*} - local x=${KV#*.} - local KV_MINOR=${x%%.*} - x=${KV#*.*.} - local KV_MICRO=${x%%-*} - - local auto="" - if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]; then - auto=/etc/modules.autoload - else - local x= f="/etc/modules.autoload.d/kernel" - for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR} ; do - if [ -f "${f}-${x}.${RC_SOFTLEVEL}" ] ; then - auto="${f}-${x}.${RC_SOFTLEVEL}" - break - fi - if [ "${RC_SOFTLEVEL}" = "${RC_BOOTLEVEL}" -a -f "${f}-${x}.${RC_DEFAULTLEVEL}" ] ; then - auto="${f}-${x}.${RC_DEFAULTLEVEL}" - break - fi - if [ -f "${f}-${x}" ] ; then - auto="${f}-${x}" - break - fi - done - fi - echo "${auto}" -} - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - - echo "export CONSOLE=${CONSOLE}" > /dev/.udev_populate - echo "export TERM=${TERM}" >> /dev/.udev_populate - echo "export MODULES_AUTOLOAD_FILE=$(get_modules_autoload_file)" >> /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ "${RC_COLDPLUG}" != "yes" ] && opts="--attr-match=dev" - /sbin/udevtrigger ${opts} - eend $? - else - ebegin "Populating /dev with existing devices with udevstart" - /sbin/udevstart - eend $? - fi - - # loop until everything is finished - # there's gotta be a better way... - ebegin "Letting udev process events" - /sbin/udevsettle --timeout=60 - eend $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - eend 0 -} - -unpack_device_tarball() { - # Actually get udev rolling - if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ - [ -s /lib/udev/state/devices.tar.bz2 ] ; then - ebegin "Populating /dev with saved device nodes" - try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev - eend $? - fi -} - -make_dev_root() { - local DEV="$(/lib/udev/get_dir_major_minor "/")" - if [ $? = 0 -a -n "${DEV}" ]; then - mknod -m 600 /dev/root b ${DEV} - fi -} - -check_persistent_net() { - # check if there are problems with persistent-net - local syspath= - local devs= - local problem_found=0 - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem_found=1 - fi - done - - [ "${problem_found}" = 0 ] && return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -main() { - # Setup temporary storage for /dev - ebegin "Mounting /dev for udev" - if [ "${RC_USE_FSTAB}" = "yes" ] ; then - mntcmd=$(get_mount_fstab /dev) - else - unset mntcmd - fi - if [ -n "${mntcmd}" ] ; then - try mount -n ${mntcmd} - else - mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev - fi - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - unpack_device_tarball - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up proper hotplug agent" - eindent - if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then - einfo "Using netlink for hotplug events..." - echo "" > /proc/sys/kernel/hotplug - else - einfo "Setting /sbin/udevsend as hotplug agent ..." - echo "/sbin/udevsend" > /proc/sys/kernel/hotplug - fi - eoutdent - eend 0 - fi - - ebegin "Starting udevd" - /sbin/udevd --daemon - eend $? - - populate_udev - make_dev_root - - # Only do this for baselayout-1* - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - ebegin "Finalizing udev configuration" - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - eend 0 - fi - - check_persistent_net - - # trigger executing initscript when /etc is writable - IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null - - # udev started successfully - return 0 -} - -main - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-start-114-r1.sh b/sys-fs/udev/files/udev-start-114-r1.sh deleted file mode 100644 index 3f611c2..0000000 --- a/sys-fs/udev/files/udev-start-114-r1.sh +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -tmpfs_size="10M" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -get_modules_autoload_file() { - # code copied from /etc/init.d/modules - - # Should not fail if kernel do not have module - # support compiled in ... - [ ! -f /proc/modules -o "${RC_SYS}" = "VPS" ] && return 0 - - local KV=$(uname -r) - local KV_MAJOR=${KV%%.*} - local x=${KV#*.} - local KV_MINOR=${x%%.*} - x=${KV#*.*.} - local KV_MICRO=${x%%-*} - - local auto="" - if [ -f /etc/modules.autoload -a ! -L /etc/modules.autoload ]; then - auto=/etc/modules.autoload - else - local x= f="/etc/modules.autoload.d/kernel" - for x in "${KV}" ${KV_MAJOR}.${KV_MINOR}.${KV_MICRO} ${KV_MAJOR}.${KV_MINOR} ; do - if [ -f "${f}-${x}.${RC_SOFTLEVEL}" ] ; then - auto="${f}-${x}.${RC_SOFTLEVEL}" - break - fi - if [ "${RC_SOFTLEVEL}" = "${RC_BOOTLEVEL}" -a -f "${f}-${x}.${RC_DEFAULTLEVEL}" ] ; then - auto="${f}-${x}.${RC_DEFAULTLEVEL}" - break - fi - if [ -f "${f}-${x}" ] ; then - auto="${f}-${x}" - break - fi - done - fi - echo "${auto}" -} - -mount_dev_directory() { - # Setup temporary storage for /dev - ebegin "Mounting /dev for udev" - if [ "${RC_USE_FSTAB}" = "yes" ] ; then - mntcmd=$(get_mount_fstab /dev) - else - unset mntcmd - fi - if [ -n "${mntcmd}" ] ; then - try mount -n ${mntcmd} - else - mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev - fi - eend $? -} - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - - echo "export CONSOLE=${CONSOLE}" > /dev/.udev_populate - echo "export TERM=${TERM}" >> /dev/.udev_populate - echo "export MODULES_AUTOLOAD_FILE=$(get_modules_autoload_file)" >> /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - # at this point we are already sure to use kernel 2.6.15 or newer - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ "${RC_COLDPLUG}" != "yes" ] && opts="--attr-match=dev" - /sbin/udevtrigger ${opts} - eend $? - - # loop until everything is finished - # there's gotta be a better way... - ebegin "Letting udev process events" - /sbin/udevsettle --timeout=60 - eend $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - eend 0 -} - -unpack_device_tarball() { - # Actually get udev rolling - if [ "${RC_DEVICE_TARBALL}" = "yes" ] && \ - [ -s /lib/udev/state/devices.tar.bz2 ] ; then - ebegin "Populating /dev with saved device nodes" - try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev - eend $? - fi -} - -check_persistent_net() { - # check if there are problems with persistent-net - local syspath= - local devs= - local problem_found=0 - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem_found=1 - fi - done - - [ "${problem_found}" = 0 ] && return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*'|tr ' ' '\n'|sort|sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -main() { - if [ $(get_KV) -le $(KV_to_int '2.6.14') ] ; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel 2.6.15 and newer." - return 1 - fi - - mount_dev_directory - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon -a -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - unpack_device_tarball - seed_dev - - if [ -e /proc/sys/kernel/hotplug ] ; then - echo "" > /proc/sys/kernel/hotplug - fi - - ebegin "Starting udevd" - /sbin/udevd --daemon - eend $? - - /lib/udev/write_root_link_rule - populate_udev - - # Only do this for baselayout-1* - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - ebegin "Finalizing udev configuration" - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - eend 0 - fi - - check_persistent_net - - # trigger executing initscript when /etc is writable - IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>/dev/null - - # udev started successfully - return 0 -} - -main - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-start-118-r2.sh b/sys-fs/udev/files/udev-start-118-r2.sh deleted file mode 100644 index b9cc048..0000000 --- a/sys-fs/udev/files/udev-start-118-r2.sh +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf -. /lib/udev/shell-compat.sh - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -le $(KV_to_int '2.6.14') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel 2.6.15 and newer." - return 1 - fi - return 0 -} - - -mount_dev_directory() -{ - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev for udev" - if fstabinfo --quiet /dev; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -unpack_device_tarball() -{ - local device_tarball=/lib/udev/state/devices.tar.bz2 - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm -} - -start_udev() -{ - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_udev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevtrigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevtrigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevtrigger --subsystem-match=net - fi - eend $? - - ebegin "Waiting for uevents to be processed" - udevsettle --timeout=60 - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -compat_device_nodes() -{ - # Only do this for baselayout-1* - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_kernel || exit $? -mount_dev_directory || exit $? - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -touch /dev/.rcsysinit - -# Selinux lovin; /selinux should be mounted by selinux-patched init -if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null -fi - -unpack_device_tarball -seed_dev - -if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug -fi - -start_udev || exit $? - -/lib/udev/write_root_link_rule -populate_udev - -compat_device_nodes - -check_persistent_net - -# trigger executing initscript when /etc is writable -IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/udev-start-122-r1.sh b/sys-fs/udev/files/udev-start-122-r1.sh deleted file mode 100644 index 150d200..0000000 --- a/sys-fs/udev/files/udev-start-122-r1.sh +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf -. /lib/udev/shell-compat.sh - -rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} - -cleanup() -{ - # fail more gracely and not leave udevd running - start-stop-daemon --stop --exec /sbin/udevd - exit 1 -} - -# FIXME -# Instead of this script testing kernel version, udev itself should -# Maybe something like udevd --test || exit $? -check_kernel() -{ - if [ $(get_KV) -lt $(KV_to_int '2.6.15') ]; then - eerror "Your kernel is too old to work with this version of udev." - eerror "Current udev only supports Linux kernel 2.6.15 and newer." - return 1 - fi - if [ $(get_KV) -lt $(KV_to_int '2.6.18') ]; then - ewarn "You need at least Linux kernel 2.6.18 for reliable operation of udev." - fi - return 0 -} - - -mount_dev_directory() -{ - # No options are processed here as they should all be in /etc/fstab - ebegin "Mounting /dev" - if fstabinfo --quiet /dev; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev - fi - eend $? -} - -unpack_device_tarball() -{ - local device_tarball=/lib/udev/state/devices.tar.bz2 - if yesno "${rc_device_tarball}" && \ - [ -s "${device_tarball}" ] - then - ebegin "Populating /dev with saved device nodes" - tar -jxpf "${device_tarball}" -C /dev - eend $? - fi -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ]; then - cp -RPp /lib/udev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm - return 0 -} - -disable_hotplug_agent() -{ - if [ -e /proc/sys/kernel/hotplug ]; then - echo "" >/proc/sys/kernel/hotplug - fi -} - -root_link() -{ - /lib/udev/write_root_link_rule -} - -start_udevd() -{ - # load unix domain sockets if built as module, Bug #221253 - if [ -e /proc/modules ] ; then - modprobe -q unix - fi - ebegin "Starting udevd" - start-stop-daemon --start --exec /sbin/udevd -- --daemon - eend $? -} - -# populate /dev with devices already found by the kernel -populate_dev() -{ - if get_bootparam "nocoldplug" ; then - rc_coldplug="NO" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices through uevents" - if yesno "${rc_coldplug}"; then - udevadm trigger - else - # Do not run any init-scripts, Bug #206518 - udevadm control --env do_not_run_plug_service=1 - - # only create device nodes - udevadm trigger --attr-match=dev - - # run persistent-net stuff, bug 191466 - udevadm trigger --subsystem-match=net - fi - eend $? - - ebegin "Waiting for uevents to be processed" - udevadm settle --timeout=60 - eend $? - - udevadm control --env do_not_run_plug_service= - return 0 -} - -compat_volume_nodes() -{ - # Only do this for baselayout-1* - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - [ -x /sbin/lvm ] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ - /sbin/evms_activate -q &>/dev/null - fi -} - -check_persistent_net() -{ - # check if there are problems with persistent-net - local syspath= devs= problem=false - for syspath in /sys/class/net/*_rename*; do - if [ -d "${syspath}" ]; then - devs="${devs} ${syspath##*/}" - problem=true - fi - done - - ${problem} || return 0 - - eerror "UDEV: Your system has a problem assigning persistent names" - eerror "to these network interfaces: ${devs}" - - einfo "Checking persistent-net rules:" - # the sed-expression lists all duplicate lines - # from the input, like "uniq -d" does, but uniq - # is installed into /usr/bin and not available at boot. - dups=$( - RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' - . /lib/udev/rule_generator.functions - find_all_rules 'NAME=' '.*' | \ - tr ' ' '\n' | \ - sort | \ - sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' - ) - if [ -n "${dups}" ]; then - ewarn "The rules create multiple entries assigning these names:" - eindent - ewarn "${dups}" - eoutdent - else - ewarn "Found no duplicate names in persistent-net rules," - ewarn "there must be some other problem!" - fi - return 1 -} - -check_udev_works() -{ - # should exist on every system, else udev failed - if [ ! -e /dev/zero ]; then - eerror "Assuming udev failed somewhere, as /dev/zero does not exist." - return 1 - fi - return 0 -} - - - -check_kernel || cleanup -mount_dev_directory || cleanup - -# Create a file so that our rc system knows it's still in sysinit. -# Existance means init scripts will not directly run. -# rc will remove the file when done with sysinit. -touch /dev/.rcsysinit - -# Selinux lovin; /selinux should be mounted by selinux-patched init -if [ -x /sbin/restorecon -a -c /selinux/null ]; then - restorecon /dev > /selinux/null -fi - -unpack_device_tarball -seed_dev -root_link -disable_hotplug_agent - -start_udevd || cleanup -populate_dev || cleanup - -compat_volume_nodes -check_persistent_net - -# trigger executing initscript when /etc is writable -IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 - -check_udev_works || cleanup - -# udev started successfully -exit 0 diff --git a/sys-fs/udev/files/udev-stop-111-r2.sh b/sys-fs/udev/files/udev-stop-111-r2.sh deleted file mode 100755 index 8d61bd1..0000000 --- a/sys-fs/udev/files/udev-stop-111-r2.sh +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -create_device_tarball() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - [ "${RC_DEVICE_TARBALL}" != "yes" ] || \ - ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tarball}" - - if [ -f ${devices_udev} ] && [ -f ${devices_real} ] && \ - [ -f ${devices_totar} ] && [ -f ${device_tarball} ] ; then - cd /dev - # Find all devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \ - "${devices_real}" - # Figure out what udev created - udevinfo=$(udevinfo --export-db) - - # This basically strips 'S:' and 'N:' from the db output, and then - # print all the nodes/symlinks udev created ... - echo "${udevinfo}" | gawk ' - /^(N|S):.+/ { - sub(/^(N|S):/, "") - split($0, nodes) - for (x in nodes) - print nodes[x] - }' > "${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}" - fi - cd /dev - fgrep -x -v -f "${devices_udev}" < "${devices_real}" | \ - grep -v ^\\.udev > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s ${devices_totar} ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network, and net may be down - tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" - mv -f "${device_tarball}" /lib/udev/state/devices.tar.bz2 - else - rm -f /lib/udev/state/devices.tar.bz2 - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - -main() { - /lib/udev/move_tmp_persistent_rules.sh - create_device_tarball -} - -main - - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-stop-118-r2.sh b/sys-fs/udev/files/udev-stop-118-r2.sh deleted file mode 100755 index 990130f..0000000 --- a/sys-fs/udev/files/udev-stop-118-r2.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -/lib/udev/move_tmp_persistent_rules.sh - -. /lib/udev/shell-compat.sh - -device_tarball=/lib/udev/state/devices.tar.bz2 - -rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} -if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - ! yesno "${rc_device_tarball}" || \ - ! touch "${device_tarball}" 2>/dev/null -then - exit 0 -fi - -ebegin "Saving device nodes" -# Handle our temp files -save_tmp_base=/tmp/udev.savedevices."$$" -devices_udev="${save_tmp_base}"/devices.udev -devices_real="${save_tmp_base}"/devices.real -devices_totar="${save_tmp_base}"/devices.totar -device_tmp_tarball="${save_tmp_base}"/devices - -rm -rf "${save_tmp_base}" -mkdir "${save_tmp_base}" -touch "${devices_udev}" "${devices_real}" \ -"${devices_totar}" "${device_tmp_tarball}" - -if [ -f "${devices_udev}" -a -f "${devices_real}" -a \ - -f "${devices_totar}" -a -f "${device_tmp_tarball}" ] -then - cd /dev - # Find all devices, but ignore .udev directory - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- | \ - grep -v ^\\.udev >"${devices_real}" - - # Figure out what udev created - udevinfo --export-db | sed -ne 's,^[SN]: \(.*\),\1,p' >"${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout root; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | \ - cut -d/ -f2- >> "${devices_udev}" - cd /dev - fi - - fgrep -x -v -f "${devices_udev}" "${devices_real}" > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s "${devices_totar}" ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network - # and net may be down - tar --one-file-system --numeric-owner \ - -jcpf "${device_tmp_tarball}" -T "${devices_totar}" - mv -f "${device_tmp_tarball}" "${device_tarball}" - else - rm -f "${device_tarball}" - fi - eend 0 -else - eend 1 "Could not create temporary files!" -fi - -rm -rf "${save_tmp_base}" diff --git a/sys-fs/udev/files/udev.conf.post_113 b/sys-fs/udev/files/udev.conf.post_113 deleted file mode 100644 index b9f6e14..0000000 --- a/sys-fs/udev/files/udev.conf.post_113 +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/udev/udev.conf: main config file for udev -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_113,v 1.1 2007/07/12 14:24:15 zzam Exp $ -# -# This file can be used to override some of udev's default values. -# See the udev man page for more details about these values. - -# udev_root - where in the filesystem to place the device nodes -udev_root="/dev/" - -# udev_rules - The name and location of the udev rules file -udev_rules="/etc/udev/rules.d/" - -# The initial syslog(3) priority: "err", "info", "debug" or its -# numerical equivalent. For runtime debugging, the daemons internal -# state can be changed with: "udevcontrol log_priority=<value>". -udev_log="err" - -# The maximum size reserved for the tmpfs mounted on /dev -tmpfs_size="10M" - -# Implictly blacklist the modules listed in modules.autoload -# so that udev (with coldplugging) does not load them -# but /etc/init.d/modules will do later. -# This can guarantee correct load order needed for -# some subsystems (like alsa, v4l, dvb, ...). -# It should be generally safe. -implicitly_blacklist_modules_autoload="yes" - diff --git a/sys-fs/udev/files/udev.conf.post_114 b/sys-fs/udev/files/udev.conf.post_114 deleted file mode 100644 index 485bb9d..0000000 --- a/sys-fs/udev/files/udev.conf.post_114 +++ /dev/null @@ -1,11 +0,0 @@ -# The maximum size reserved for the tmpfs mounted on /dev -tmpfs_size="10M" - -# Implictly blacklist the modules listed in modules.autoload -# so that udev (with coldplugging) does not load them -# but /etc/init.d/modules will do later. -# This can guarantee correct load order needed for -# some subsystems (like alsa, v4l, dvb, ...). -# It should be generally safe. -implicitly_blacklist_modules_autoload="yes" - diff --git a/sys-fs/udev/files/udev.confd b/sys-fs/udev/files/udev.confd deleted file mode 100644 index 0a0ca7d..0000000 --- a/sys-fs/udev/files/udev.confd +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/conf.d/udev: config file for udev - -# We discourage to disable persistent-net!! -# this may lead to random interface naming - -# Disable adding new rules for persistent-net -persistent_net_disable="no" - diff --git a/sys-fs/udev/files/udev.initd b/sys-fs/udev/files/udev.initd deleted file mode 100755 index 80135e3..0000000 --- a/sys-fs/udev/files/udev.initd +++ /dev/null @@ -1,59 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Mount /dev and let udev create the device-nodes" - -depend() -{ - if [ -f /etc/init.d/sysfs ]; then - # require new enough openrc with sysinit being extra runlevel - # on linux we just check if sysfs init-script exists - # this is to silence out ugly warnings about not-existing sysfs script - provide dev - need sysfs - before checkfs fsck - - # udev does not work inside vservers - keyword novserver - fi -} - -display_hotplugged_services() { - local svcfile= svc= services= - for svcfile in "${RC_SVCDIR}"/hotplugged/*; do - svc="${svcfile##*/}" - [ -x "${svcfile}" ] || continue - - # do not display this - better: do only inject it later :) - [ "$svc" = "udev-postmount" ] && continue - - services="${services} ${svc}" - done - [ -n "${services}" ] && einfo "Device initiated services:${HILITE}${services}${NORMAL}" -} - -inject_postmount_initd() { - mark_service_hotplugged udev-postmount - #einfo "Injected udev-postmount service" -} - -start() -{ - # do not run this on too old baselayout - udev-addon is already loaded! - if [ ! -e /lib/librc.so -a -f /etc/init.d/sysfs ]; then - eerror "The $SVCNAME init-script is written for baselayout-2!" - eerror "Please do not use it with baselayout-1!". - return 1 - fi - - start_addon udev || return 1 - display_hotplugged_services - inject_postmount_initd - return 0 -} - -stop() -{ - stop_addon udev -} diff --git a/sys-fs/udev/files/write_root_link_rule b/sys-fs/udev/files/write_root_link_rule deleted file mode 100755 index 4d6cd78..0000000 --- a/sys-fs/udev/files/write_root_link_rule +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# This script should run before doing udevtrigger at boot. -# It will create a rule matching the device directory / is on, and -# creating /dev/root symlink pointing on its device node. -# -# This is especially useful for hal looking at /proc/mounts containing -# a line listing /dev/root as device: -# /dev/root / reiserfs rw 0 0 -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation version 2 of the License. -# -# (c) 2007 Matthias Schwarzott <zzam@gentoo.org> - -DEV=$(udevadm info --device-id-of-file=/) -if [ $? = 0 ]; then - MAJOR="${DEV% *}" - MINOR="${DEV#* }" - - [ -d /dev/.udev/rules.d ] || mkdir -p /dev/.udev/rules.d - RULES=/dev/.udev/rules.d/10-root-link.rules - - echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}" - echo "# This rule should create /dev/root as link to real root device." >> "${RULES}" - echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$MAJOR\", ENV{MINOR}==\"$MINOR\", SYMLINK+=\"root\"" >> "${RULES}" -fi - diff --git a/sys-fs/udev/files/write_root_link_rule-125 b/sys-fs/udev/files/write_root_link_rule-125 deleted file mode 100755 index 8eaea11..0000000 --- a/sys-fs/udev/files/write_root_link_rule-125 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# This script should run before doing udevtrigger at boot. -# It will create a rule matching the device directory / is on, and -# creating /dev/root symlink pointing on its device node. -# -# This is especially useful for hal looking at /proc/mounts containing -# a line listing /dev/root as device: -# /dev/root / reiserfs rw 0 0 -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation version 2 of the License. -# -# (c) 2007-2008 Matthias Schwarzott <zzam@gentoo.org> - -eval $(udevadm info --export --export-prefix="ROOT_" --device-id-of-file=/) - -[ $? = 0 ] || exit 0 -[ "$ROOT_MAJOR" = 0 ] && exit 0 - -DIR=/dev/.udev/rules.d -[ -d "$DIR" ] || mkdir -p "$DIR" -RULES=$DIR/10-root-link.rules - -echo "# Created by /lib/udev/write_root_link_rule" > "${RULES}" -echo "# This rule should create /dev/root as link to real root device." >> "${RULES}" -echo "SUBSYSTEM==\"block\", ENV{MAJOR}==\"$ROOT_MAJOR\", ENV{MINOR}==\"$ROOT_MINOR\", SYMLINK+=\"root\"" >> "${RULES}" - diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml deleted file mode 100644 index e839579..0000000 --- a/sys-fs/udev/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>udev-bugs@gentoo.org</email> -</maintainer> -<use> - <flag name="extras">Compile udev-extras requiring external dependencies</flag> - <flag name="openrc">Enable hotplug via openrc init scripts</flag> - <flag name="systemd">Install systemd service files</flag> -</use> -</pkgmetadata> diff --git a/sys-fs/udev/udev-168-r2.ebuild b/sys-fs/udev/udev-168-r2.ebuild deleted file mode 100644 index 9b488fa..0000000 --- a/sys-fs/udev/udev-168-r2.ebuild +++ /dev/null @@ -1,524 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-168-r2.ebuild,v 1.1 2011/05/14 14:00:34 zzam Exp $ - -EAPI="1" - -inherit eutils flag-o-matic multilib toolchain-funcs linux-info autotools systemd - -PATCHSET=${P}-gentoo-patchset-v1 -scriptversion=v3 -scriptname=udev-gentoo-scripts-${scriptversion} - -if [[ ${PV} == "9999" ]]; then - SRC_URI="mirror://gentoo/${scriptname}.tar.bz2" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" - EGIT_BRANCH="master" - inherit git autotools -else - # please update testsys-tarball whenever udev-xxx/test/sys/ is changed - SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 - test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 ) - mirror://gentoo/${scriptname}.tar.bz2" - [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" -fi -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -# The systemd use-flag is here only to make sure that this ebuild rather than -# the one in the main tree is used for sys-apps/systemd, so that we can ensure -# the installation of the systemd units. -IUSE="selinux extras +openrc systemd test" - -COMMON_DEPEND="selinux? ( sys-libs/libselinux ) - extras? ( - sys-apps/acl - >=sys-apps/usbutils-0.82 - virtual/libusb:0 - sys-apps/pciutils - dev-libs/glib:2 - ) - >=sys-apps/util-linux-2.16 - >=sys-libs/glibc-2.9" - -DEPEND="${COMMON_DEPEND} - extras? ( - dev-util/gperf - dev-util/pkgconfig - ) - virtual/os-headers - !<sys-kernel/linux-headers-2.6.29 - test? ( app-text/tree )" - -RDEPEND="${COMMON_DEPEND} - !sys-apps/coldplug - !<sys-fs/lvm2-2.02.45 - !sys-fs/device-mapper - >=sys-apps/baselayout-1.12.5" - -if [[ ${PV} == "9999" ]]; then - # for documentation processing with xsltproc - DEPEND="${DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd - dev-util/gtk-doc" -fi - -# required kernel options -CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!IDE" - -udev_check_KV() { - local ok=0 - if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] - then - if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then - ok=2 - elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then - ok=1 - fi - fi - return $ok -} - -pkg_setup() { - linux-info_pkg_setup - - # udev requires signalfd introduced in kernel 2.6.25, - # but a glibc compiled against >=linux-headers-2.6.27 uses the - # new signalfd syscall introduced in kernel 2.6.27 without falling back - # to the old one. So we just depend on 2.6.27 here, see Bug #281312. - KV_PATCH_min=25 - KV_PATCH_reliable=31 - KV_min=2.6.${KV_PATCH_min} - KV_reliable=2.6.${KV_PATCH_reliable} - - # always print kernel version requirements - ewarn - ewarn "${P} does not support Linux kernel before version ${KV_min}!" - if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then - ewarn "For a reliable udev, use at least kernel ${KV_reliable}" - fi - - echo - # We don't care about the secondary revision of the kernel. - # 2.6.30.4 -> 2.6.30 is all we check - udev_check_KV - case "$?" in - 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;; - 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," - ewarn "but it may be unreliable in some cases." - ebeep ;; - 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" - ebeep ;; - esac - echo - - KV_FULL_SRC=${KV_FULL} - get_running_version - udev_check_KV - if [[ "$?" = "0" ]]; then - eerror - eerror "udev cannot be restarted after emerging," - eerror "as your running kernel version (${KV_FULL}) is too old." - eerror "You really need to use a newer kernel after a reboot!" - NO_RESTART=1 - ebeep - fi -} - -src_unpack() { - unpack ${A} - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - else - if use test; then - mv "${WORKDIR}"/test/sys "${S}"/test/ - fi - fi - - #cd "${WORKDIR}/${scriptname}" - - cd "${S}" - - # patches go here... - - # backport some patches - if [[ -n "${PATCHSET}" ]]; then - EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - fi - - # change rules back to group uucp instead of dialout for now - sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ - -i rules/{rules.d,arch}/*.rules \ - || die "failed to change group dialout to uucp" - - if [[ ${PV} != 9999 ]]; then - # Make sure there is no sudden changes to upstream rules file - # (more for my own needs than anything else ...) - MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules") - MD5=${MD5/ -/} - if [[ ${MD5} != a9954d57e97aa0ad2e0ed53899d9559a ]] - then - echo - eerror "50-udev-default.rules has been updated, please validate!" - eerror "md5sum: ${MD5}" - die "50-udev-default.rules has been updated, please validate!" - fi - fi - - if [[ ${PV} == 9999 ]]; then - gtkdocize --copy || die "gtkdocize failed" - eautoreconf - fi -} - -src_compile() { - filter-flags -fprefetch-loop-arrays - - econf \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/sbin \ - --libdir=/usr/$(get_libdir) \ - --with-rootlibdir=/$(get_libdir) \ - --libexecdir=/lib/udev \ - --enable-logging \ - --enable-static \ - $(use_with selinux) \ - $(use_enable extras) \ - --disable-introspection \ - "$(systemd_with_unitdir)" - # we don't have gobject-introspection in portage tree - - emake || die "compiling udev failed" -} - -src_install() { - emake -C "${WORKDIR}/${scriptname}" \ - DESTDIR="${D}" LIBDIR="$(get_libdir)" \ - KV_min="${KV_min}" KV_reliable="${KV_reliable}" \ - install || die "make install failed" - - if ! use openrc; then - rm "${D}/lib/udev/rules.d/90-network.rules" || die - rm "${D}/lib/udev/net.sh" || die - fi - - into / - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /lib/udev - keepdir /lib/udev/state - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym "../lib/udev/scsi_id" /sbin/scsi_id - - # Add gentoo stuff to udev.conf - echo "# If you need to change mount-options, do it in /etc/fstab" \ - >> "${D}"/etc/udev/udev.conf - - # let the dir exist at least - keepdir /etc/udev/rules.d - - # Now installing rules - cd "${S}"/rules - insinto /lib/udev/rules.d/ - - # support older kernels - doins misc/30-kernel-compat.rules - - # Adding arch specific rules - if [[ -f arch/40-${ARCH}.rules ]] - then - doins "arch/40-${ARCH}.rules" - fi - cd "${S}" - - insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf - newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf - - # documentation - dodoc ChangeLog README TODO || die "failed installing docs" - - # keep doc in just one directory, Bug #281137 - rm -rf "${D}/usr/share/doc/${PN}" - if use extras; then - dodoc extras/keymap/README.keymap.txt || die "failed installing docs" - fi -} - -pkg_preinst() { - # moving old files to support newer modprobe, 12 May 2009 - local f dir=${ROOT}/etc/modprobe.d/ - for f in pnp-aliases blacklist; do - if [[ -f $dir/$f && ! -f $dir/$f.conf ]] - then - elog "Moving $dir/$f to $f.conf" - mv -f "$dir/$f" "$dir/$f.conf" - fi - done - - if [[ -d ${ROOT}/lib/udev-state ]] - then - mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ - rm -r "${ROOT}"/lib/udev-state - fi - - if [[ -f ${ROOT}/etc/udev/udev.config && - ! -f ${ROOT}/etc/udev/udev.rules ]] - then - mv -f "${ROOT}"/etc/udev/udev.config "${ROOT}"/etc/udev/udev.rules - fi - - # delete the old udev.hotplug symlink if it is present - if [[ -h ${ROOT}/etc/hotplug.d/default/udev.hotplug ]] - then - rm -f "${ROOT}"/etc/hotplug.d/default/udev.hotplug - fi - - # delete the old wait_for_sysfs.hotplug symlink if it is present - if [[ -h ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] - then - rm -f "${ROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug - fi - - # delete the old wait_for_sysfs.hotplug symlink if it is present - if [[ -h ${ROOT}/etc/hotplug.d/default/10-udev.hotplug ]] - then - rm -f "${ROOT}"/etc/hotplug.d/default/10-udev.hotplug - fi - - has_version "=${CATEGORY}/${PN}-103-r3" - previous_equal_to_103_r3=$? - - has_version "<${CATEGORY}/${PN}-104-r5" - previous_less_than_104_r5=$? - - has_version "<${CATEGORY}/${PN}-106-r5" - previous_less_than_106_r5=$? - - has_version "<${CATEGORY}/${PN}-113" - previous_less_than_113=$? -} - -# 19 Nov 2008 -fix_old_persistent_net_rules() { - local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules - [[ -f ${rules} ]] || return - - elog - elog "Updating persistent-net rules file" - - # Change ATTRS to ATTR matches, Bug #246927 - sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" - - # Add KERNEL matches if missing, Bug #246849 - sed -ri \ - -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ - "${rules}" -} - -# See Bug #129204 for a discussion about restarting udevd -restart_udevd() { - if [[ ${NO_RESTART} = "1" ]]; then - ewarn "Not restarting udevd, as your kernel is too old!" - return - fi - - # need to merge to our system - [[ ${ROOT} = / ]] || return - - # check if root of init-process is identical to ours (not in chroot) - [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return - - # abort if there is no udevd running - [[ -n $(pidof udevd) ]] || return - - # abort if no /dev/.udev exists - [[ -e /dev/.udev ]] || return - - elog - elog "restarting udevd now." - - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - - /sbin/udevd --daemon - sleep 3 - if [[ ! -n $(pidof udevd) ]]; then - eerror "FATAL: udev died, please check your kernel is" - eerror "new enough and configured correctly for ${P}." - eerror - eerror "Please have a look at this before rebooting." - eerror "If in doubt, please downgrade udev back to your old version" - ebeep - fi -} - -postinst_init_scripts() { - # 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 - # * we add udev-postmount to default in here - # - - # migration to >=openrc-0.4 - if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] - then - ewarn - ewarn "You need to add the udev init script to the runlevel sysinit," - ewarn "else your system will not be able to boot" - ewarn "after updating to >=openrc-0.4.0" - ewarn "Run this to enable udev for >=openrc-0.4.0:" - ewarn "\trc-update add udev sysinit" - ewarn - fi - - # add udev-postmount to default runlevel instead of that ugly injecting - # like a hotplug event, 2009/10/15 - - # 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 - - if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \ - [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]] - then - 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 -} - -pkg_postinst() { - fix_old_persistent_net_rules - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${ROOT}"/dev/loop 2>/dev/null - if [[ -d "${ROOT}"/dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - restart_udevd - - postinst_init_scripts - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 - if [[ $previous_equal_to_103_r3 = 0 ]] && - [[ -e ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f "${ROOT}"/etc/udev/rules.d/40-scsi-hotplug.rules - fi - - # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 - if [[ -d ${ROOT}/lib/udev/devices ]] - then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file, 29 Jan 2007 - if [[ $previous_less_than_104_r5 = 0 ]] - then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null - fi - - # 19 Mar 2007 - if [[ $previous_less_than_106_r5 = 0 ]] && - [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] - then - rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules - fi - - # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 - if [[ -d ${ROOT}/etc/dev.d ]] - then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null - if [[ -d ${ROOT}/etc/dev.d ]] - then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - # 64-device-mapper.rules now gets installed by sys-fs/device-mapper - # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 - if [[ $previous_less_than_113 = 0 ]] && - [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && - ! has_version sys-fs/device-mapper - then - rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules - einfo "Removed unneeded file 64-device-mapper.rules" - fi - - # requested in bug #275974, added 2009/09/05 - ewarn - ewarn "If after the udev update removable devices or CD/DVD drives" - ewarn "stop working, try re-emerging HAL before filling a bug report" - - # requested in Bug #225033: - elog - elog "persistent-net does assigning fixed names to network devices." - elog "If you have problems with the persistent-net rules," - elog "just delete the rules file" - elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" - elog "and then reboot." - elog - elog "This may however number your devices in a different way than they are now." - - ewarn - ewarn "If you build an initramfs including udev, then please" - ewarn "make sure that the /sbin/udevadm binary gets included," - ewarn "and your scripts changed to use it,as it replaces the" - ewarn "old helper apps udevinfo, udevtrigger, ..." - - ewarn - ewarn "mount options for directory /dev are no longer" - ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" - ewarn "as for other directories." - - ewarn - ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," - ewarn "then please migrate over to using the device names" - ewarn "/dev/md*, /dev/loop* and /dev/ram*." - ewarn "The devfs-compat rules have been removed." - ewarn "For reference see Bug #269359." - - ewarn - ewarn "Rules for /dev/hd* devices have been removed" - ewarn "Please migrate to libata." - - elog - elog "For more information on udev on Gentoo, writing udev rules, and" - elog " fixing known issues visit:" - elog " http://www.gentoo.org/doc/en/udev-guide.xml" -} |