summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-02-16 10:34:00 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-02-16 10:34:00 +0000
commit1663f7f5147fdc7b3bc3754334f766d6b032fc51 (patch)
tree357769f529f6e2d1d1715193391dec2af6149287
parent323c90f9e059bb555821239ea453deea3727c50f (diff)
downloaddrakx-backup-do-not-use-1663f7f5147fdc7b3bc3754334f766d6b032fc51.tar
drakx-backup-do-not-use-1663f7f5147fdc7b3bc3754334f766d6b032fc51.tar.gz
drakx-backup-do-not-use-1663f7f5147fdc7b3bc3754334f766d6b032fc51.tar.bz2
drakx-backup-do-not-use-1663f7f5147fdc7b3bc3754334f766d6b032fc51.tar.xz
drakx-backup-do-not-use-1663f7f5147fdc7b3bc3754334f766d6b032fc51.zip
allow installing from ext3/ext4/reiser4
-rw-r--r--mdk-stage1/Makefile2
-rw-r--r--mdk-stage1/NEWS3
-rw-r--r--mdk-stage1/tools.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 07091f182..5f174b417 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.34
+VERSION=1.35
PRODUCT=drakx-installer-binaries
#
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 269a82df8..cd8a2b7aa 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,6 @@
+1.35:
+- allow installing from ext3/ext4/reiser4
+
1.34:
- adapt to new modules.dep format (prefix modules with directory path)
- try to use arch-prefixed location for automatic disk installs
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index ff19063f1..9b05918b6 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -272,10 +272,11 @@ int try_mount(char * dev, char * location)
char device_fullname[50];
snprintf(device_fullname, sizeof(device_fullname), "/dev/%s", dev);
- if (my_mount(device_fullname, location, "ext2", 0) == -1 &&
+ if (my_mount(device_fullname, location, "ext4", 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 &&
+ my_mount(device_fullname, location, "reiser4", 0) == -1 &&
my_mount(device_fullname, location, "jfs", 0) == -1 &&
my_mount(device_fullname, location, "xfs", 0) == -1 &&
my_mount(device_fullname, location, "iso9660", 0) == -1) {