the real diff for PATCH 2/2

Vratislav Podzimek vpodzime at redhat.com
Wed Aug 13 11:15:36 UTC 2014


Signed-off-by: Vratislav Podzimek <vpodzime at redhat.com>
---

diff --git a/docs/commit-log.txt b/docs/commit-log.rst
similarity index 97%
rename from docs/commit-log.txt
rename to docs/commit-log.rst
index 2e3f227..82f178f 100644
--- a/docs/commit-log.txt
+++ b/docs/commit-log.rst
@@ -1,3 +1,6 @@
+Rules for commit messages
+==========================
+
 git commit messages for anaconda should follow a consistent format.  The
 following are rules to follow when committing a change to the git repo:
 
@@ -36,7 +39,7 @@ following are rules to follow when committing a change to the git repo:
 
    b)  If you have a patch that is Related to or Conflicts with another bug,
        you may add those lines to the end of the long commit message in this
-       format:
+       format::
 
            Related: rhbz#BUGNUMBER
            Conflicts: rhbz#BUGNUMBER
diff --git a/docs/driverdisc.txt b/docs/driverdisc.rst
similarity index 92%
rename from docs/driverdisc.txt
rename to docs/driverdisc.rst
index 1e28c39..dfde6ee 100644
--- a/docs/driverdisc.txt
+++ b/docs/driverdisc.rst
@@ -9,11 +9,12 @@ many reasons for it:
 - the old DD wasn't particulary easy to create
 - the old DD had two copys of modules, one for anaconda and one for
   instalation
-- the modules in old DD weren't checked for kernel version 
+- the modules in old DD weren't checked for kernel version
 
 We also changed the feature internal code to enable some functionality that
 was missing from the old version. More about it below.
 
+
 Devices which can contain DDs
 -----------------------------
 
@@ -22,6 +23,7 @@ The best place to save your DriverDisc to is USB flash device. We also support
 image stored on block device, initrd overlay (see documentation below) and for
 special cases even network retrieval of DriverDisc image.
 
+
 What can be updated using DDs?
 ------------------------------
 
@@ -35,6 +37,7 @@ official repository, the newer package will get used.
 We also plan to support anaconda's updates.img placement on the DriverDisc to
 update stage2 behaviour of anaconda.
 
+
 Selecting DD manually
 ---------------------
 
@@ -44,6 +47,7 @@ rpm. Otherwise, the rpm will be fetched from the specified location.
 
 Please consult the appropriate Installer Guide for further information.
 
+
 Automatic DriverDisc detection
 ------------------------------
 
@@ -59,18 +63,21 @@ DDv3 structure
 The new DriverDisc format uses simple layout which can be created on top of
 any anaconda's supported filesystem (vfat, squashfs, ext2 and ext3).
 
-/
-|rhdd3   - DD marker, contains the DD's description string
-/rpms
-|  /i386 - contains RPMs for this arch and acts as Yum repo
-|  /i586
-|  /x86_64
-|  /ppc
-|  /...  - any other architecture the DD provides drivers for
+::
+
+    /
+    |rhdd3   - DD marker, contains the DD's description string
+    /rpms
+      |  /i386 - contains RPMs for this arch and acts as Yum repo
+      |  /i586
+      |  /x86_64
+      |  /ppc
+      |  /...  - any other architecture the DD provides drivers for
 
 There is a special requirement for the RPMs used to update drivers. Anaconda
 picks up only RPMs which provide "kernel-modules = <running kernel version>".
 
+
 Initrd overlay driverdisc image
 -------------------------------
 
@@ -89,6 +96,7 @@ to respect some rules.
 - The rpm repo with updated packages belongs to /tmp/DD-initrd/
 - The (empty) trigger file /.rundepmod must be present
 
+
 Firmware and module update
 --------------------------
 
@@ -102,6 +110,7 @@ modules will be loaded. There is one exception though, if your module depends
 on a module which is only present in built-in module directory, that built-in
 module gets also loaded.
 
+
 Package installation
 --------------------
 
@@ -115,4 +124,3 @@ Summary
 
 This new DriverDisc format should simplify the DD creation and usage a lot. We
 will gladly hear any comments as this is partially still work in progress.
-
diff --git a/docs/iscsi.txt b/docs/iscsi.rst
similarity index 95%
rename from docs/iscsi.txt
rename to docs/iscsi.rst
index ee41582..847078d 100644
--- a/docs/iscsi.txt
+++ b/docs/iscsi.rst
@@ -1,7 +1,8 @@
-==================
 iSCSI and Anaconda
 ==================
 
+:Authors:
+   Ales Kozumplik <akozumpl at redhat.com>
 
 Introduction
 ------------
@@ -154,16 +155,11 @@ Future of iSCSI in Anaconda
   that needs to be done before RHEL7. Difficulty medium.
 - improve libiscsi's logging capabilities. Difficulty easy.
 
+.. [1] http://www.open-iscsi.org/
+.. [2] /usr/share/doc/iscsi-initiator-utils-6.*/README
+.. [3] man 7 dracut.kernel
+.. [4] Anaconda git repository, anaconda/loader/ibft.c
+.. [5] Anaconda git repository, anaconda/loader/net.c, chooseNetworkInterface()
+.. [6] Anaconda git repository, anaconda/storage/iscsi.py
+.. [7] 'man 8 iscsiadm'
 
-
-[1] http://www.open-iscsi.org/
-[2] /usr/share/doc/iscsi-initiator-utils-6.*/README
-[3] man 7 dracut.kernel
-[4] Anaconda git repository, anaconda/loader/ibft.c
-[5] Anaconda git repository, anaconda/loader/net.c, chooseNetworkInterface()
-[6] Anaconda git repository, anaconda/storage/iscsi.py
-[7] 'man 8 iscsiadm'
-
-
----
-Red Hat Author(s): Ales Kozumplik <akozumpl at redhat.com>
diff --git a/docs/multipath.txt b/docs/multipath.rst
similarity index 94%
rename from docs/multipath.txt
rename to docs/multipath.rst
index e8af24e..eb2910d 100644
--- a/docs/multipath.txt
+++ b/docs/multipath.rst
@@ -1,7 +1,8 @@
-======================
 Multipath and Anaconda
 ======================
 
+:Authors:
+   Ales Kozumplik <akozumpl at redhat.com>
 
 Introduction
 ------------
@@ -10,10 +11,10 @@ If there are two block devices in your /dev for which udev reports the same
 'ID_SERIAL' then you can create a certain device mapper device which arbitrarily
 uses those devices to access the physical device. And that is Multipath [1].
 
-For instance, suppose there are
+For instance, suppose there are::
 
-/dev/sda, with ID_SERIAL of 20090ef12700001d2, and
-/dev/sdb, with the same ID_SERIAL.
+  /dev/sda, with ID_SERIAL of 20090ef12700001d2, and
+  /dev/sdb, with the same ID_SERIAL.
 
 Those are probably some adapters in the system that just connect your box to a
 storage area network (SAN) somewhere. There are perhaps two cables, one for sda,
@@ -28,7 +29,6 @@ either sda or sdb depending on the load of the line or network congestion on the
 particular network etc.
 
 The nomenclature I will use here is:
-
 - 'multipath device' for the smart /dev/mapper/mpathX device.
 - 'multipath member device' for the '/dev/sdX' devices. Also 'a path'.
 
@@ -83,7 +83,7 @@ make it to the sysimage before the dracut image is generated.
 
 
 Debugging multipath bugs
-------------------------
+-------------------------
 
 Unlike with iSCSI, to reproduce a multipath bug one does not need the same
 specific hardware as the reporter. Just found any box connected to a multipathed
@@ -108,7 +108,7 @@ particularly look at are:
 
 
 Future of multipath in Anaconda
--------------------------------
+--------------------------------
 
 Overall as of RHEL6.2, the shape of multipath in Anaconda is good and what's
 more important it is flexible enough to sustain new RFEs and bugs. Those are
@@ -132,12 +132,7 @@ however bugs that I expect to appear sometime soon:
   debugging possible on any virt machine with multiple virt NICs.
 
 
+.. [1] http://akozumpl.fedorapeople.org/archive/Multipass.jpg
+.. [2] http://christophe.varoqui.free.fr/
+.. [3] 'man 8 multipath'
 
-[1] http://akozumpl.fedorapeople.org/archive/Multipass.jpg
-[2] http://christophe.varoqui.free.fr/
-[3] 'man 8 multipath'
-
-
-
----
-Red Hat Author(s): Ales Kozumplik <akozumpl at redhat.com>


More information about the anaconda-patches mailing list