diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-06-10 08:27:35 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-06-10 08:27:35 +0000 |
| commit | f10a9e1aeb6115154dfc3986a56c3e4d11bc133a (patch) | |
| tree | 8aa05793dcd5b3932dc4f088951c60cecb1a4391 | |
| parent | b7b49ef7423519c15a92c2f7c0b333c99a2872bb (diff) | |
| download | drakx-f10a9e1aeb6115154dfc3986a56c3e4d11bc133a.tar drakx-f10a9e1aeb6115154dfc3986a56c3e4d11bc133a.tar.gz drakx-f10a9e1aeb6115154dfc3986a56c3e4d11bc133a.tar.bz2 drakx-f10a9e1aeb6115154dfc3986a56c3e4d11bc133a.tar.xz drakx-f10a9e1aeb6115154dfc3986a56c3e4d11bc133a.zip | |
ntfs support in install from disk (on nplanel request, but to actually work, it would need the BOOT kernels to include the ntfs module)
| -rw-r--r-- | kernel/list_modules.pm | 2 | ||||
| -rw-r--r-- | mdk-stage1/disk.c | 3 | ||||
| -rw-r--r-- | mdk-stage1/mount.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index fbfdcce96..097d032fa 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -115,7 +115,7 @@ our %l = ( cdrom => [ qw(isofs) ], loopback => [ qw(isofs loop), if_($ENV{MOVE}, qw(cryptoloop gzloop supermount)) ], local => [ - if_(arch() =~ /^i.86|x86_64/, qw(vfat fat)), + if_(arch() =~ /^i.86|x86_64/, qw(vfat fat ntfs)), if_(arch() =~ /^ppc/, qw(hfs)), qw(reiserfs), ], diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c index f6694dd68..331767226 100644 --- a/mdk-stage1/disk.c +++ b/mdk-stage1/disk.c @@ -191,6 +191,7 @@ static int try_mount(char * dev, char * location) if (my_mount(device_fullname, location, "ext2", 0) == -1 && my_mount(device_fullname, location, "vfat", 0) == -1 && + my_mount(device_fullname, location, "ntfs", 0) == -1 && my_mount(device_fullname, location, "reiserfs", 0) == -1) { return 1; } @@ -233,7 +234,7 @@ static enum return_type try_with_device(char *dev_name) } if (try_mount(choice, disk_own_mount)) { - stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, reiserfs)."); + stg1_error_message("I can't find a valid filesystem (tried: ext2, vfat, ntfs, reiserfs)."); return try_with_device(dev_name); } diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c index ca2a083de..9d48f3665 100644 --- a/mdk-stage1/mount.c +++ b/mdk-stage1/mount.c @@ -196,6 +196,10 @@ int my_mount(char *dev, char *location, char *fs, int force_rw) opts = "check=relaxed"; } + if (!strcmp(fs, "ntfs")) { + my_insmod("ntfs", ANY_DRIVER_TYPE, NULL, 1); + } + if (!strcmp(fs, "reiserfs")) my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL, 1); |