Author: glen
Date: Thu Apr 2 22:24:09 2009
New Revision: 10273
Modified:
geninitrd/trunk/geninitrd
geninitrd/trunk/geninitrd.8.xml
Log:
- reap out --with-insmod-static
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Thu Apr 2 22:24:09 2009
@@ -20,7 +20,6 @@
. /etc/sysconfig/system
COMPRESS=yes
-USEINSMODSTATIC=no
USE_SUSPEND=yes
USE_TUXONICE=no
# it should be safe to remove scsi_mod from here, but I'm not sure...
@@ -32,7 +31,6 @@
MODULES=""
img_vers=""
fstab=/etc/fstab
-insmod=insmod
modext=.o
rootdev_nr=0
# device node for rootfs from fstab
@@ -71,7 +69,7 @@
echo "usage: $PROGRAM [--version] [-v] [-f] [--ifneeded] [--preload
<module>]"
echo " [--with=<module>] [--image-version] [--fstab=<fstab>]
[--nocompress]"
echo " [--initrdfs=rom|initramfs|ext2|cram]
[--modules-conf=<modules.conf>]"
- echo " [--with-raidstart] [--without-raidstart]
[--with-insmod-static]"
+ echo " [--with-raidstart] [--without-raidstart]"
echo " [--with-bootsplash] [--without-bootsplash]"
echo " [--with-fbsplash] [--without-fbsplash]"
echo " [--with-fbcondecor] [--without-fbcondecor]"
@@ -661,7 +659,7 @@
fi
fi
- echo "$insmod /lib/modules/$kernel/$modpath $options" |
add_linuxrc
+ echo "insmod /lib/modules/$kernel/$modpath $options" |
add_linuxrc
if [ -n "$sleep_var" ]; then
echo "usleep $sleep_var" | add_linuxrc
fi
@@ -1121,12 +1119,6 @@
--without-raidstart)
USERAIDSTART=no
;;
- --use-insmod-static|--with-insmod-static)
- USEINSMODSTATIC=yes
- ;;
- --without-insmod-static)
- USEINSMODSTATIC=no
- ;;
--with-bootsplash)
BOOT_SPLASH=yes
;;
@@ -1285,18 +1277,6 @@
if [ "$kernel_version" -ge "002005" ]; then
modext=".ko"
- insmod="insmod"
-fi
-
-if is_yes "$USEINSMODSTATIC"; then
- insmod="insmod.static"
- INSMOD="/sbin/insmod.static"
- if [ "$kernel_version" -lt "002005" -a -f /sbin/insmod.static.modutils
]; then
- INSMOD="/sbin/insmod.static.modutils"
- fi
- if [ ! -f "$INSMOD" ]; then
- die "insmod.static requested but /sbin/insmod.static not found!"
- fi
fi
case "$INITRDFS" in
@@ -1443,10 +1423,6 @@
ln -s initrd-busybox $DESTDIR/bin/sh
ln -s initrd-busybox $DESTDIR/bin/busybox # for older busyboxes who had
/bin/busybox as EXEPATH
-if is_yes "$USEINSMODSTATIC"; then
- inst_exec "$INSMOD" /bin/insmod.static
-fi
-
add_linuxrc <<EOF
#!/bin/sh
# initrd generated by:
Modified: geninitrd/trunk/geninitrd.8.xml
==============================================================================
--- geninitrd/trunk/geninitrd.8.xml (original)
+++ geninitrd/trunk/geninitrd.8.xml Thu Apr 2 22:24:09 2009
@@ -25,7 +25,6 @@
<arg>--lvmtoolsversion=1|2</arg>
<arg>--modules-conf=modules.conf</arg>
<arg>--fs=rom|ext2|cram</arg>
- <arg>--with-insmod-static</arg>
<arg choice="req">image</arg>
<arg choice="req">kernel-version</arg>
</cmdsynopsis>
@@ -153,12 +152,6 @@
kernel.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term>--with-insmod-static</term>
- <listitem>
- <para>Use <filename>/sbin/insmod.static</filename> insteed of
<command>bsp</command> bulitin insmod.</para>
- </listitem>
- </varlistentry>
<varlistentry>
<term>--lvmtoolsversion=1|2</term>
<listitem>
@@ -192,11 +185,6 @@
Additionally, for <application>fbsplash</application> and
<application>bootsplash</application> you need to pass special kernel
parameters during boot. Use <application>rc-boot</application>,
<application>lilo</application> or <application>grub</application> to pass the
parameters. For details on parameters please consult
<application>fbsplash</application> or <application>bootsplash</application>
documentation.
</para>
</refsect1>
-<refsect1>
- <title>Linux 2.6.x support</title>
- <para>To bulild initrd for Linux 2.6.x kernels you must have
module-init-tools and use --with-insmod-static switch or use initrd version of
recent busybox that comes in busybox-initrd package.
- </para>
-</refsect1>
<!-- refsect1>
<title>Hardware RAID support</title>
<para>
@@ -246,10 +234,6 @@
<manvolnum>5</manvolnum>
</citerefentry>
<citerefentry>
- <refentrytitle>insmod</refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>
- <citerefentry>
<refentrytitle>grub</refentrytitle>
<manvolnum>8</manvolnum>
</citerefentry>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
