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
19 years ago · e4820423a3
parent acf66c992d
commit e4820423a3
7 changed files with 9 additions and 3 deletions
--- 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"
--- 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'
--- 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 
--- 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"
--- 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"
--- 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"
--- 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"