summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-03-19 06:46:26 +0000
committerMike Frysinger <vapier@gentoo.org>2008-03-19 06:46:26 +0000
commitbd1a2c450ecfc94dd7343cb26838a2cf36134875 (patch)
tree35e317030c2f384e91519b5c67c3a34463c0c7b6 /sys-apps/module-init-tools
parentBump. (diff)
downloadhistorical-bd1a2c450ecfc94dd7343cb26838a2cf36134875.tar.gz
historical-bd1a2c450ecfc94dd7343cb26838a2cf36134875.tar.bz2
historical-bd1a2c450ecfc94dd7343cb26838a2cf36134875.zip
delay some initialization to make the optimal path even more optimal so we execute faster at boot
Package-Manager: portage-2.2_pre2
Diffstat (limited to 'sys-apps/module-init-tools')
-rw-r--r--sys-apps/module-init-tools/Manifest8
-rwxr-xr-xsys-apps/module-init-tools/files/update-modules-3.4.sh34
2 files changed, 23 insertions, 19 deletions
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index be348e2bbf84..3ec6a6317ef1 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -11,7 +11,7 @@ AUX modutils-2.4.27-gcc.patch 7438 RMD160 a3d1fa1e6dd865e531684882daab881b90d0e1
AUX modutils-2.4.27-hppa.patch 302 RMD160 15c0b2aadee725ef21370c9f016da6c74b882b6f SHA1 6af5f392dd173eacacc258211c67ef103ccaff49 SHA256 9b4e629a310732129b96766e0c6f185008e98f8429551da85372a01fa59c7d05
AUX modutils-2.4.27-no-nested-function.patch 1422 RMD160 6c34f6ff25019884495c21af525e88a63e449b3c SHA1 17eeaddba0fc3e476138a05d570eb79ab77b67ed SHA256 3e9961a7c9411e8c01eb48d9053d7901ec7a90ee0e070e85bd766385f36d563d
AUX update-modules 11529 RMD160 f4ff9435a4ff40cbb7e24aae5a4c3c77b9302789 SHA1 d91933f8aa35d77961ff8f7eb90736c2f19f67bd SHA256 0fc8fa66a87790a9d411a2a282600b36ada09b230a70d164d1c1e9bd2850ee66
-AUX update-modules-3.4.sh 10300 RMD160 2fdb39604bb986d0f7c626b41099df62c247fc17 SHA1 8183c6255c674ced947d9fd7e93962b9a9303500 SHA256 13c95167a3e34556d314fc2ca8232e973f9c987c846021abb0b4b6dc160a37f0
+AUX update-modules-3.4.sh 10380 RMD160 82ba9eef6970acbe88ef3a3eb3431a35e80fe111 SHA1 eaf50bac5ce0737a64b109a78137db1780916091 SHA256 f6cd3acd0d26570ac043f600b9705bfdc5c6b4b0d331c5c713c98f5b18ed829e
AUX update-modules.8 3210 RMD160 6d82ea356c1751ad46cf1c30e0fe237e7a4f50f2 SHA1 ed64791ca8e3215ee8a98784326f5d1c8a60bfd4 SHA256 4e352ee28ecaf79fac2a0216b8b4b52ced864cd258752f33213d1ac8f4a5849c
DIST module-init-tools-3.2.2.tar.bz2 169182 RMD160 42abfe10709315180898106e3c7c1ce916e01166 SHA1 b51e8ac170be23a1f2e301a1dddd47a47ec2186a SHA256 c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa
DIST module-init-tools-3.4-manpages.tar.bz2 8819 RMD160 2d8e413dc0c85504494ef57508b0886ada487c03 SHA1 7c2d0d86391c4dfa8569f8fcf21cf3334dc323f5 SHA256 d26c038aa95d791436ce106a6b888d6487f0d9a47eb2962b1819ca1c1f112d4a
@@ -25,7 +25,7 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFH4LZij9hvisErhMIRAh4iAKCZDWtNrZ5chme/86aDoh1gXfqFAgCgqIyB
-W8ss6zZCLfmzA+vpvxo9vbM=
-=4dil
+iD8DBQFH4Lcqj9hvisErhMIRAkdlAKCloMLOueRo/5tAIHBo7VAAA9pWpQCaAtAL
+J0a1g/Xs3DMdsGoYj4sTxpg=
+=RYvV
-----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/update-modules-3.4.sh b/sys-apps/module-init-tools/files/update-modules-3.4.sh
index f0804dc487f2..f8129a99fae6 100755
--- a/sys-apps/module-init-tools/files/update-modules-3.4.sh
+++ b/sys-apps/module-init-tools/files/update-modules-3.4.sh
@@ -52,7 +52,7 @@ while [ -n "$1" ] ; do
-f|--force|force) FORCE="true";;
-v|--verbose) ((VERBOSE+=1));;
-d|--debug) ((DEBUG+=1));;
- -V|--version) exec echo "${argv0}$Revision: 1.3 $ $Date: 2008/03/19 06:43:06 $";;
+ -V|--version) exec echo "${argv0}$Revision: 1.4 $ $Date: 2008/03/19 06:46:26 $";;
-h|--help)
cat <<-EOF
Usage: update-modules [options]
@@ -81,7 +81,6 @@ if [ ! -w ./etc ] ; then
exit 2
fi
-KV=${KV:-$(uname -r)}
[ ${DEBUG} -gt 0 ] && set -x
veinfo() { [ ${VERBOSE} -gt 0 ] && einfo "$*" ; return 0 ; }
@@ -89,19 +88,6 @@ vewarn() { [ ${VERBOSE} -gt 0 ] && ewarn "$*" ; return 0 ; }
[ "${ROOT}" != "/" ] && veinfo "Operating on ROOT = '${ROOT}'"
-if type -P modprobe.old > /dev/null || \
- LC_ALL=C modprobe -V 2>/dev/null | grep -qs "modprobe version"
-then
- GENERATE_OLD="true"
-else
- GENERATE_OLD="false"
-fi
-
-
-# Reset the sorting order since we depend on it
-export LC_COLLATE="C"
-
-
#
# Let's check the optimal case first: nothing to do
#
@@ -148,6 +134,24 @@ done
#
+# If the system doesnt have old modutils, then this is prob linux-2.6 only
+#
+if type -P modprobe.old > /dev/null || \
+ LC_ALL=C modprobe -V 2>/dev/null | grep -qs "modprobe version"
+then
+ GENERATE_OLD="true"
+else
+ GENERATE_OLD="false"
+fi
+
+
+# Reset the sorting order since we depend on it
+export LC_COLLATE="C"
+
+KV=${KV:-$(uname -r)}
+
+
+#
# Desc: backup a config file if need be and replace with new one
# Usage: backup <old config file to backup> <new config file to replace with>
# Ex: backup /etc/modules.conf /etc/modules.conf.tempfile