summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-03-08 18:14:15 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-03-08 18:14:15 +0000
commitd562a5550425e90637a1ea84a650a28fe1c0e961 (patch)
tree9ab6662e3dd1db4e095d1626c92ba410f3340dc4 /mdk-stage1
parentdb95fc95368285ec2e30639842548ce24fb7bd96 (diff)
downloaddrakx-d562a5550425e90637a1ea84a650a28fe1c0e961.tar
drakx-d562a5550425e90637a1ea84a650a28fe1c0e961.tar.gz
drakx-d562a5550425e90637a1ea84a650a28fe1c0e961.tar.bz2
drakx-d562a5550425e90637a1ea84a650a28fe1c0e961.tar.xz
drakx-d562a5550425e90637a1ea84a650a28fe1c0e961.zip
load appropriate modules before trying to mount ext4/reiser4
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/Makefile2
-rw-r--r--mdk-stage1/NEWS3
-rw-r--r--mdk-stage1/mount.c6
3 files changed, 10 insertions, 1 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index e7c2a7e82..4754e274e 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-VERSION=1.35
+VERSION=1.36
PRODUCT=drakx-installer-binaries
#
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index cd8a2b7aa..c127ecc7a 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,6 @@
+1.36:
+- load appropriate modules before trying to mount ext4/reiser4
+
1.35:
- allow installing from ext3/ext4/reiser4
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 59536a718..2b3e0f89d 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -206,12 +206,18 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
if (!strcmp(fs, "reiserfs"))
my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL, 1);
+ if (!strcmp(fs, "reiser4"))
+ my_insmod("reiser4", ANY_DRIVER_TYPE, NULL, 1);
+
if (!strcmp(fs, "jfs"))
my_insmod("jfs", ANY_DRIVER_TYPE, NULL, 1);
if (!strcmp(fs, "xfs"))
my_insmod("xfs", ANY_DRIVER_TYPE, NULL, 1);
+ if (!strcmp(fs, "ext4"))
+ my_insmod("ext4", ANY_DRIVER_TYPE, NULL, 1);
+
#endif
if (!strcmp(fs, "iso9660"))
my_insmod("isofs", ANY_DRIVER_TYPE, NULL, 1);