diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-09-15 09:54:49 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-09-15 09:54:49 -0400 |
| commit | bc551e694adb2816711025480684eb0000b8d878 (patch) | |
| tree | 0709ec02b25c8439c198bb98c32f4b44f5bce06b | |
| parent | 845b4770ba10e2d45c6d1263d38f95b77bb96ed7 (diff) | |
| download | anaconda-bc551e694adb2816711025480684eb0000b8d878.tar.gz anaconda-bc551e694adb2816711025480684eb0000b8d878.tar.xz anaconda-bc551e694adb2816711025480684eb0000b8d878.zip | |
md, lock_nolock, and dm_emc kernel modules no longer exist.
| -rw-r--r-- | liveinst/liveinst.sh | 2 | ||||
| -rw-r--r-- | loader/loader.c | 2 | ||||
| -rwxr-xr-x | scripts/mk-images | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/liveinst/liveinst.sh b/liveinst/liveinst.sh index 5848df7fb..f06ba3166 100644 --- a/liveinst/liveinst.sh +++ b/liveinst/liveinst.sh @@ -32,7 +32,7 @@ if [ ! -b $LIVE_BLOCK ]; then fi # load modules that would get loaded by the loader... (#230945) -for i in md raid0 raid1 raid5 raid6 raid456 raid10 fat msdos lock_nolock gfs2 reiserfs ext2 ext3 jfs xfs dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin dm-emc vfat ; do /sbin/modprobe $i ; done +for i in raid0 raid1 raid5 raid6 raid456 raid10 fat msdos gfs2 reiserfs ext2 ext3 jfs xfs dm-mod dm-zero dm-mirror dm-snapshot dm-multipath dm-round-robin vfat ; do /sbin/modprobe $i ; done export ANACONDA_PRODUCTNAME="Fedora" export ANACONDA_PRODUCTVERSION=$(rpm -q fedora-release --qf "%{VERSION}") diff --git a/loader/loader.c b/loader/loader.c index 421198844..3aca1c59f 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2068,7 +2068,7 @@ int main(int argc, char ** argv) { stop_fw_loader(&loaderData); start_fw_loader(&loaderData); - mlLoadModuleSet("md:raid0:raid1:raid5:raid6:raid456:raid10:linear:fat:msdos:jbd:lock_nolock:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-emc:dm-crypt:crypto_blkcipher:cbc:aes:sha256:lrw:xts"); + mlLoadModuleSet("raid0:raid1:raid5:raid6:raid456:raid10:linear:fat:msdos:jbd:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-crypt:crypto_blkcipher:cbc:aes:sha256:lrw:xts"); if (!access("/mnt/runtime/usr/lib/libunicode-lite.so.1", R_OK)) setenv("LD_PRELOAD", "/mnt/runtime/usr/lib/libunicode-lite.so.1", 1); diff --git a/scripts/mk-images b/scripts/mk-images index fa32513d1..278a0740f 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -111,8 +111,8 @@ USBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage sd_mod sr_mod ub ap FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci" IDEMODS="ide-cd ide-cd_mod" SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft" -FSMODS="fat msdos vfat ext2 ext3 ext4dev reiserfs jfs xfs gfs2 lock_nolock cifs" -LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-emc dm-crypt" +FSMODS="fat msdos vfat ext2 ext3 ext4dev reiserfs jfs xfs gfs2 cifs" +LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt" RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear" CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4" PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia" |