Added code to allow the root file-system to be a module. This is for bug #118098.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@404 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/alpha/modules_load b/alpha/modules_load
index ccbc7e7792ffa2387ae7650e768fcb9f739ea4eb..98f9f40936927746929e947fd76f7e593226ae9b 100644 (file)
--- a/alpha/modules_load
+++ b/alpha/modules_load
@@ -19,3 +19,4 @@ MODULES_LVM2="dm-mod dm-snapshot dm-mirror dm-bbr"
 MODULES_EVMS2="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 \
 raid5 raid6 raid10"
 MODULES_DMRAID="dm-mod dm-mirror"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index 391602622e45db826feb3e1faaa7438e872e3cad..657df53115eaa3b00221bf4bcae6d94ac6a85f52 100644 (file)
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -78,5 +78,5 @@ CONSOLE="/dev/console"
 
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
-HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid slowusb'
-MY_HWOPTS='usb firewire sata dmraid'
+HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid slowusb fs'
+MY_HWOPTS='usb firewire sata dmraid fs'

diff --git a/generic/linuxrc b/generic/linuxrc
index f83d1e072122e03a9101466e5e52a7d3f982c54b..99d121980301c6ffd9c96df5852d7256defb20de 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -390,7 +390,8 @@ do
                        findnfsmount
                else
                        # mount ro so fsck doesn't barf later
-                       mount -o ro ${REAL_ROOT} ${NEW_ROOT}
+                       REAL_ROOT_TYPE=`vol_id -t ${REAL_ROOT}`
+                       mount -t ${REAL_ROOT_TYPE} -o ro ${REAL_ROOT} ${NEW_ROOT}
                fi
                
                # If mount is successful break out of the loop 

diff --git a/x86/modules_load b/x86/modules_load
index f99208ebba4bf78b50ac8755e6ee5ae9127907cf..3f5d62c96cac30dfebe82ef7caa16dfc57260cab 100644 (file)
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -22,3 +22,4 @@ MODULES_DMRAID="dm-mod dm-mirror"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
 ata_piix sata_mv pdc_adma"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/x86_64/modules_load b/x86_64/modules_load
index f99208ebba4bf78b50ac8755e6ee5ae9127907cf..3f5d62c96cac30dfebe82ef7caa16dfc57260cab 100644 (file)
--- a/x86_64/modules_load
+++ b/x86_64/modules_load
@@ -22,3 +22,4 @@ MODULES_DMRAID="dm-mod dm-mirror"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
 ata_piix sata_mv pdc_adma"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/xen0/modules_load b/xen0/modules_load
index f99208ebba4bf78b50ac8755e6ee5ae9127907cf..3f5d62c96cac30dfebe82ef7caa16dfc57260cab 100644 (file)
--- a/xen0/modules_load
+++ b/xen0/modules_load
@@ -22,3 +22,4 @@ MODULES_DMRAID="dm-mod dm-mirror"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
 ata_piix sata_mv pdc_adma"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"

diff --git a/xenU/modules_load b/xenU/modules_load
index f99208ebba4bf78b50ac8755e6ee5ae9127907cf..3f5d62c96cac30dfebe82ef7caa16dfc57260cab 100644 (file)
--- a/xenU/modules_load
+++ b/xenU/modules_load
@@ -22,3 +22,4 @@ MODULES_DMRAID="dm-mod dm-mirror"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
 sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci \
 ata_piix sata_mv pdc_adma"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"