search for: minix_imag

...include <string.h> #include <unistd.h> #include <fcntl.h> #include <endian.h> #include <netinet/in.h> +#include <sys/utsname.h> #include <sys/vfs.h> #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ @@ -110,29 +112,142 @@ static int minix_image(const void *buf, unsigned long long *bytes) return 0; } -static int ext4_image(const void *buf, unsigned long long *bytes) +/* + * Check to see if a filesystem is in /proc/filesystems. + * Returns 1 if found, 0 if not + */ +static int fs_proc_check(const char *fs_name) +{ + FILE *f; + char bu...

...cramfs_image }, @@ -237,9 +241,9 @@ { 0, "luks", luks_image }, { 0, "lvm2", lvm2_image }, { 1, "lvm2", lvm2_image }, - { 1, "minix", minix_image }, { 1, "ext3", ext3_image }, { 1, "ext2", ext2_image }, + { 1, "minix", minix_image }, { 8, "reiserfs", reiserfs_image }, { 64,...

...[12]; @@ -189,17 +206,18 @@ }; static struct imagetype images[] = { - { 0, "gzip", gzip_image }, - { 0, "cramfs", cramfs_image }, - { 0, "romfs", romfs_image }, - { 0, "xfs", xfs_image }, - { 0, "luks", luks_image }, - { 1, "minix", minix_image }, - { 1, "ext3", ext3_image }, - { 1, "ext2", ext2_image }, - { 8, "reiserfs", reiserfs_image }, - { 64, "reiserfs", reiserfs_image }, - { 32, "jfs", jfs_image } + { 0, "gzip", gzip_image }, + { 0, "cramfs", cramfs_image...

...0x0080 +#define EXT4_FEATURE_INCOMPAT_MMP 0x0100 /* * Structure of the super block diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c index 015b7a0..3465676 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -107,6 +107,25 @@ static int minix_image(const void *buf, unsigned long long *bytes) return 0; } +static int ext4_image(const void *buf, unsigned long long *bytes) +{ + const struct ext3_super_block *sb = + (const struct ext3_super_block *)buf; + + if (sb->s_magic == __cpu_to_le16(EXT2_SUPER_MAGIC) + && (sb->s_featur...

...return 1; + } + return 0; +} + struct imagetype { off_t block; const char name[12]; @@ -179,6 +193,7 @@ { 0, "cramfs", cramfs_image }, { 0, "romfs", romfs_image }, { 0, "xfs", xfs_image }, + { 0, "luks", luks_image }, { 1, "minix", minix_image }, { 1, "ext3", ext3_image }, { 1, "ext2", ext2_image }, Index: klibc/usr/kinit/fstype/luks_fs.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ klibc/usr/kinit/fstype/luks_fs.h 2006-02-05 10:57:52....

...agetype { off_t block; const char name[12]; @@ -214,6 +235,8 @@ { 0, "romfs", romfs_image }, { 0, "xfs", xfs_image }, { 0, "luks", luks_image }, + { 0, "lvm2", lvm2_image }, + { 1, "lvm2", lvm2_image }, { 1, "minix", minix_image }, { 1, "ext3", ext3_image }, { 1, "ext2", ext2_image }, diff -Nur klibc-orig/usr/kinit/fstype/lvm2_sb.h klibc/usr/kinit/fstype/lvm2_sb.h --- klibc-orig/usr/kinit/fstype/lvm2_sb.h 1970-01-01 01:00:00.000000000 +0100 +++ klibc/usr/kinit/fstype/lvm2_sb.h 2006-03-23 00:46:...

...;romfs", romfs_image }, { 0, "xfs", xfs_image }, { 0, "luks", luks_image }, - { 0, "lvm2", lvm2_image }, - { 1, "lvm2", lvm2_image }, { 1, "ext3", ext3_image }, { 1, "ext2", ext2_image }, { 1, "minix", minix_image }, { 8, "reiserfs", reiserfs_image }, { 64, "reiserfs", reiserfs_image }, { 32, "jfs", jfs_image }, + { 0, "lvm2", lvm2_image }, + { 1, "lvm2", lvm2_image }, { -1, "swap", swap_image }, { 0, "", NULL } }...

...mages[] = { {0, "gzip", gzip_image}, {0, "cramfs", cramfs_image}, {0, "romfs", romfs_image}, {0, "xfs", xfs_image}, - {0, "luks", luks_image}, {1, "ext3", ext3_image}, {1, "ext2", ext2_image}, {1, "minix", minix_image}, {8, "reiserfs", reiserfs_image}, {64, "reiserfs", reiserfs_image}, {32, "jfs", jfs_image}, + {0, "luks", luks_image}, {0, "lvm2", lvm2_image}, {1, "lvm2", lvm2_image}, {-1, "swap", swap_image},

...r_block *)buf; + + if (sb->magic == __cpu_to_le32(F2FS_SUPER_MAGIC)) { + *bytes = 0; + return 1; + } + return 0; +} + struct imagetype { off_t block; const char name[12]; @@ -502,6 +515,7 @@ static struct imagetype images[] = { {1, "ext2", ext2_image}, {1, "minix", minix_image}, {1, "nilfs2", nilfs2_image}, + {1, "f2fs", f2fs_image}, {2, "ocfs2", ocfs2_image}, {8, "reiserfs", reiserfs_image}, {64, "reiserfs", reiserfs_image}, -- 1.8.5.2

...== __cpu_to_le32(2)) { + *bytes = (unsigned long long)__le64_to_cpu(sb->s_dev_size); + return 1; + } + return 0; +} + struct imagetype { off_t block; const char name[12]; @@ -354,6 +368,7 @@ {1, "ext3", ext3_image}, {1, "ext2", ext2_image}, {1, "minix", minix_image}, + {1, "nilfs2", nilfs2_image}, {2, "ocfs2", ocfs2_image}, {8, "reiserfs", reiserfs_image}, {64, "reiserfs", reiserfs_image}, diff -Nur klibc-1.5.7.orig/usr/kinit/fstype/nilfs_fs.h klibc-1.5.7/usr/kinit/fstype/nilfs_fs.h --- klibc-1.5.7.orig/usr/kinit...

...| 116 +--------------------------------------------- 1 file changed, 1 insertion(+), 115 deletions(-) diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c index c5a14328..aebcccad 100644 --- a/usr/kinit/fstype/fstype.c +++ b/usr/kinit/fstype/fstype.c @@ -113,88 +113,7 @@ static int minix_image(const void *buf, unsigned long long *bytes) return 0; } -/* - * Check to see if a filesystem is in /proc/filesystems. - * Returns 1 if found, 0 if not - */ -static int fs_proc_check(const char *fs_name) -{ - FILE *f; - char buf[80], *cp, *t; - - f = fopen("/proc/filesystems", "...

...OCFS2_SUPER_BLOCK_SIGNATURE) - 1)) { + *bytes = 0; + return 1; + } + return 0; +} + struct imagetype { off_t block; const char name[12]; @@ -340,6 +354,7 @@ static struct imagetype images[] = { {1, "ext3", ext3_image}, {1, "ext2", ext2_image}, {1, "minix", minix_image}, + {2, "ocfs2", ocfs2_image}, {8, "reiserfs", reiserfs_image}, {64, "reiserfs", reiserfs_image}, {64, "reiser4", reiser4_image}, diff --git a/usr/kinit/fstype/ocfs2_fs.h b/usr/kinit/fstype/ocfs2_fs.h new file mode 100644 index 0000000..b71cb61 --- /de...

hello hpa, nothing particular stands out, just syncing with latest Debian upload and subsequent patch emails. please review merge or nack. thanks :) maks git pull git://git.debian.org/~maks/klibc.git maks for the changes: Aaron Griffin (1): [klibc] kinit: skip md assembly if mdX exists Colin Watson (1): [klibc] mount/umount FUSE support Harald Jenny (1): [klibc] fstype: