summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-07 00:11:21 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-08-07 00:11:21 -0700
commit2f90b35a7292515f26f65b947a9c2f065e9f65e4 (patch)
treedbfc7210425a235cacd8379b3ed4fcc6d4704a26
parent115baf602655e84d93b6d26feba16a8fadab1292 (diff)
downloadsyslinux-2f90b35a7292515f26f65b947a9c2f065e9f65e4.tar.gz
extlinux: add ext4 support to the installersyslinux-4.00-pre1
The filesystem code now supports ext4, so support it in the installer as well. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--extlinux/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index 476d0063..79ead181 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -14,7 +14,7 @@
/*
* extlinux.c
*
- * Install the extlinux boot block on an ext2/3 filesystem
+ * Install the extlinux boot block on an ext2/3/4 filesystem
*/
#define _GNU_SOURCE /* Enable everything */
@@ -618,7 +618,7 @@ int install_bootblock(int fd, const char *device)
}
if (sb.s_magic != EXT2_SUPER_MAGIC) {
- fprintf(stderr, "no ext2/ext3 superblock found on %s\n", device);
+ fprintf(stderr, "no ext2/3/4 superblock found on %s\n", device);
return 1;
}
@@ -766,7 +766,8 @@ static const char *find_device(const char *mtab_file, dev_t dev)
while ((mnt = getmntent(mtab))) {
if ((!strcmp(mnt->mnt_type, "ext2") ||
- !strcmp(mnt->mnt_type, "ext3")) &&
+ !strcmp(mnt->mnt_type, "ext3") ||
+ !strcmp(mnt->mnt_type, "ext4")) &&
!stat(mnt->mnt_fsname, &dst) && dst.st_rdev == dev) {
devname = strdup(mnt->mnt_fsname);
break;
@@ -796,7 +797,7 @@ int install_loader(const char *path, int update_only)
}
if (sfs.f_type != EXT2_SUPER_MAGIC) {
- fprintf(stderr, "%s: not an ext2/ext3 filesystem: %s\n", program, path);
+ fprintf(stderr, "%s: not an ext2/3/4 filesystem: %s\n", program, path);
return 1;
}