- added --with-insmod-static to allow using /sbin/insmod.static if bsp internal insmo...

- use DocBook XML 4.2 for man page
- describe --with-insmod-static and Linux 2.5.x support
- small "despamification"

svn-id: @1257

diff --git a/geninitrd b/geninitrd
index 0e92827a4abb4dd468f18d38362d2825dedff00f..f9dacf65225818dea629e9e073787024f9124321 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -6,7 +6,7 @@
 #
 # based on mkinitrd from RedHat
 
-RCSID='$Id: geninitrd,v 2.25 2003/02/19 08:49:26 wiget Exp $'
+RCSID='$Id: geninitrd,v 2.26 2003/04/09 11:40:39 wiget Exp $'
 PATH=/sbin:$PATH
 export PATH
 
@@ -38,7 +38,7 @@ usage () {
        echo "usage: `basename $0` [--version] [-v] [-f] [--ifneeded] [--preload <module>]" 1>&2
        echo "       [--with=<module>] [--image-version] [--fstab=<fstab>] [--nocompress]" 1>&2
        echo "       [--initrdfs=rom|ext2|cram] [--modules-conf=<modules.conf>]" 1>&2
-       echo "       [--with-raidstart] [--without-raidstart]" 1>&2
+       echo "       [--with-raidstart] [--without-raidstart] [--with-insmod-static]" 1>&2
        echo "       <initrd-image> <kernel-version>" 1>&2
        echo "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" 1>&2
        exit 1
@@ -510,6 +510,12 @@ while [ $# -gt 0 ]; do
        --without-raidstart)
                USERAIDSTART="no"
                ;;
+       --use-insmod-static|--with-insmod-static)
+               USEINSMODSTATIC="yes"
+               ;;
+       --without-insmod-static)
+               USEINSMODSTATIC="no"
+               ;;
        --with=*)
                BASICMODULES="$BASICMODULES `echo $1 | awk -F= '{print $2;}'`"
                ;;
@@ -584,6 +590,10 @@ if [ "$pack_version" -ge "002005" ] ; then
        insmod="insmod_ng"
 fi
 
+if is_yes "$USEINSMODSTATIC" ; then
+       insmod="insmod.static"
+fi
+
 case "$INITRDFS" in
        ext2)
                if [ ! -x /sbin/mke2fs ]; then
@@ -712,6 +722,10 @@ else
        inst /sbin/bsp "$RCFILE"
 fi
 
+if is_yes "$USEINSMODSTATIC" && test -f /sbin/insmod.static; then
+       inst /sbin/insmod.static $MNTIMAGE/bin/insmod.static
+fi
+
 echo "# autogenerated startup" > "$s"
 echo "" >> "$s"
 

diff --git a/geninitrd.8.xml b/geninitrd.8.xml
index ed47d680c47060a480875f7538cbcb8df3f3961e..5401ed7d9e48c7c19a14a78f0327fd1f41288a35 100644 (file)
--- a/geninitrd.8.xml
+++ b/geninitrd.8.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-                         "file:///usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd">
-
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <refentry>
   <refmeta>
     <refentrytitle>geninitrd</refentrytitle>
     <manvolnum>8</manvolnum>
     <refmiscinfo class="software">PLD</refmiscinfo>
-    <refmiscinfo class="date">$Date: 2003/02/19 08:43:47 $</refmiscinfo>
+    <refmiscinfo class="date">$Date: 2003/04/09 11:40:39 $</refmiscinfo>
   </refmeta>
   <refnamediv>
     <refname>geninitrd</refname>
@@ -25,7 +24,8 @@
       <arg>--fstab=fstab</arg>
       <arg>--raidtab=raidtab</arg>
       <arg>--modules-conf=modules.conf</arg>
-      <arg>--fs=rom|ext2|cram</arg>
+         <arg>--fs=rom|ext2|cram</arg>
+         <arg>--with-insmod-static</arg>
       <arg choice="req">image</arg>
       <arg choice="req">kernel-version</arg>
     </cmdsynopsis>
@@ -161,6 +161,12 @@
            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>
     </variablelist>
 </refsect1>
 <refsect1>
@@ -176,6 +182,11 @@
        </para>
        <para>For eg. if you have Promise FastTrack controler then add "alias ataraid_hostadapter pdcraid" to /etc/modules.conf.</para>
 </refsect1>
+<refsect1>
+       <title>Linux 2.5.x support</title>
+       <para>To bulild initrd for Linux 2.5.x kernels you must have module-init-tools and use --with-insmod-static switch or wait for bsp with fixed insmod_ng.
+       </para>
+</refsect1>
 <!-- refsect1>
        <title>Hardware RAID support</title>
        <para>
@@ -245,48 +256,48 @@
   <refsect1>
     <title>Authors</title>
     <para><application>geninitrd</application> is based on mkinitrd by
-      Erik Troan <email>ewt@redhat.com</email> and contributors: 
+      Erik Troan <email>ewt(at)redhat.com</email> and contributors: 
       <simplelist>
-       <member>Elliot Lee <email>sopwith@cuc.edu</email></member>
+       <member>Elliot Lee <email>sopwith(at)cuc.edu</email></member>
        <member> Miguel de Icaza
-         <email>miguel@nuclecu.unam.mx</email></member>
+         <email>miguel(at)nuclecu.unam.mx</email></member>
        <member>Christian 'Dr. Disk' Hechelmann
-         <email>drdisk@ds9.au.s.shuttle.de</email></member>
+         <email>drdisk(at)ds9.au.s.shuttle.de</email></member>
        <member>Michael K. Johnson
-         <email>johnsonm@redhat.com</email></member>
+         <email>johnsonm(at)redhat.com</email></member>
        <member>Pierre Habraken
-         <email>Pierre.Habraken@ujf-grenoble.fr</email></member>
+         <email>Pierre.Habraken(at)ujf-grenoble.fr</email></member>
        <member>Jakub Jelinek
-         <email>jj@ultra.linux.cz</email></member>
+         <email>jj(at)ultra.linux.cz</email></member>
        <member>Carlo Arenas Belon
-         <email>carenas@chasqui.lared.net.pe</email></member>
+         <email>carenas(at)chasqui.lared.net.pe</email></member>
       </simplelist>
     </para>
     <para><application>geninitrd</application> is writen by Jacek
-      Konieczny <email>jajcus@pld.org.pl</email> and contributors (in
+      Konieczny <email>jajcus(at)pld.org.pl</email> and contributors (in
       alphabetic order): <simplelist>
-       <member>Witold Filipczyk <email>witekfl@poczta.onet.pl</email></member>
-       <member>Artur Frysiak <email>wiget@pld.org.pl</email></member>
+       <member>Witold Filipczyk <email>witekfl(at)poczta.onet.pl</email></member>
+       <member>Artur Frysiak <email>wiget(at)pld.org.pl</email></member>
        <member>Dariusz Karolczak
-         <email>inglod@pld.org.pl</email></member>
+         <email>inglod(at)pld.org.pl</email></member>
        <member>Tomasz Kłoczko
-         <email>kloczek@pld.org.pl</email></member>
+         <email>kloczek(at)pld.org.pl</email></member>
        <member>Arkadiusz Miśkiewicz
-         <email>misiek@pld.org.pl</email></member>
+         <email>misiek(at)pld.org.pl</email></member>
        <member>Michał Moskal
-         <email>malekith@pld.org.pl</email></member>
+         <email>malekith(at)pld.org.pl</email></member>
        <member>Jan Rękorajski
-         <email>baggins@pld.org.pl</email></member>
+         <email>baggins(at)pld.org.pl</email></member>
        <member>Sebastian Zagrodzki
-         <email>zagrodzki@pld.org.pl</email></member>
+         <email>zagrodzki(at)pld.org.pl</email></member>
        <member>Michał Zawalich
-         <email>michuz@pld.org.pl</email></member>
+         <email>michuz(at)pld.org.pl</email></member>
       </simplelist>
     </para>
     <para> Manual page for <application>geninitrd</application> is
-      based on mkinitrd.8 by Erik Troan <email>ewt@redhat.com</email>
+      based on mkinitrd.8 by Erik Troan <email>ewt(at)redhat.com</email>
       and writen by Jacek Konieczny
-      <email>jajcus@pld.org.pl</email> and contributors.</para>
+      <email>jajcus(at)pld.org.pl</email> and contributors.</para>
   </refsect1>
 </refentry>
 <!-- vim61: set fileencoding=utf-8 : -->