Here is my patch for e2fsprogs but Leonid seems to be better (at least
in some parts).
On Thu, Sep 24, 2009 at 08:55, Leonid Lisovskiy <[email protected]> wrote:
>>Has anyone done any initial work on that? I would be interested in making it
>>happen...
>
>>Matt
>
> We done partial repair of e2fsprogs for busybox in our project. You
> can take a look at patch
> http://code.google.com/p/wl500g/source/browse/trunk/busybox/105-e2fsprogs.patch
>
> Regards,
> Leonid
> _______________________________________________
> busybox mailing list
> [email protected]
> http://lists.busybox.net/mailman/listinfo/busybox
>
diff -Naur busybox-1.14.3-orig/e2fsprogs/Config.in busybox-1.14.3/e2fsprogs/Config.in
--- busybox-1.14.3-orig/e2fsprogs/Config.in 2009-07-29 01:33:00.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/Config.in 2009-08-16 22:34:29.000000000 +0200
@@ -11,14 +11,14 @@
help
chattr changes the file attributes on a second extended file system.
-### config E2FSCK
-### bool "e2fsck"
-### default n
-### help
-### e2fsck is used to check Linux second extended file systems (ext2fs).
-### e2fsck also supports ext2 filesystems countaining a journal (ext3).
-### The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
-### provided.
+config E2FSCK
+ bool "e2fsck"
+ default n
+ help
+ e2fsck is used to check Linux second extended file systems (ext2fs).
+ e2fsck also supports ext2 filesystems countaining a journal (ext3).
+ The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+ provided.
config FSCK
bool "fsck"
@@ -34,27 +34,27 @@
help
lsattr lists the file attributes on a second extended file system.
-### config MKE2FS
-### bool "mke2fs"
-### default n
-### help
-### mke2fs is used to create an ext2/ext3 filesystem. The normal compat
-### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+config MKE2FS
+ bool "mke2fs"
+ default n
+ help
+ mke2fs is used to create an ext2/ext3 filesystem. The normal compat
+ symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
-### config TUNE2FS
-### bool "tune2fs"
-### default n
-### help
-### tune2fs allows the system administrator to adjust various tunable
-### filesystem parameters on Linux ext2/ext3 filesystems.
+config TUNE2FS
+ bool "tune2fs"
+ default n
+ help
+ tune2fs allows the system administrator to adjust various tunable
+ filesystem parameters on Linux ext2/ext3 filesystems.
-### config E2LABEL
-### bool "e2label"
-### default n
-### depends on TUNE2FS
-### help
-### e2label will display or change the filesystem label on the ext2
-### filesystem located on device.
+config E2LABEL
+ bool "e2label"
+ default n
+ depends on TUNE2FS
+ help
+ e2label will display or change the filesystem label on the ext2
+ filesystem located on device.
### NB: this one is now provided by util-linux/volume_id/*
### config FINDFS
diff -Naur busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2fsck.c busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2fsck.c
--- busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2fsck.c 2009-08-02 20:16:36.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2fsck.c 2009-08-16 23:15:48.000000000 +0200
@@ -45,7 +45,7 @@
static void e2fsck_pass1_dupblocks(e2fsck_t ctx, char *block_buf);
/* pass1.c */
-static void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool);
+static void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int mybool);
/* pass2.c */
static int e2fsck_process_bad_inode(e2fsck_t ctx, ext2_ino_t dir,
@@ -4560,11 +4560,11 @@
return 0;
}
-void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool)
+void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int mybool)
{
ext2_filsys fs = ctx->fs;
- if (bool) {
+ if (mybool) {
fs->get_blocks = pass1_get_blocks;
fs->check_directory = pass1_check_directory;
fs->read_inode = pass1_read_inode;
diff -Naur busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2p/e2p.h busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2p/e2p.h
--- busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2p/e2p.h 2009-07-29 01:33:00.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2p/e2p.h 2009-08-16 22:49:05.000000000 +0200
@@ -38,7 +38,7 @@
void list_super2(struct ext2_super_block * s, FILE *f);
#define list_super(s) list_super2(s, stdout)
void print_fs_errors (FILE *f, unsigned short errors);
-void print_flags (FILE *f, unsigned long flags, unsigned options);
+void print_flags_e2p (FILE *f, unsigned long flags, unsigned options);
void print_fs_state (FILE *f, unsigned short state);
int setflags (int fd, unsigned long flags);
int setversion (int fd, unsigned long version);
diff -Naur busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2p/pf.c busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2p/pf.c
--- busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/e2p/pf.c 2009-07-29 01:33:00.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/old_e2fsprogs/e2p/pf.c 2009-08-16 22:49:11.000000000 +0200
@@ -48,7 +48,7 @@
{ 0, NULL, NULL }
};
-void print_flags (FILE *f, unsigned long flags, unsigned options)
+void print_flags_e2p (FILE *f, unsigned long flags, unsigned options)
{
int long_opt = (options & PFOPT_LONG);
const struct flags_name *fp;
diff -Naur busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild busybox-1.14.3/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild
--- busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild 2009-07-29 01:33:00.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild 2009-08-16 22:45:40.000000000 +0200
@@ -20,4 +20,4 @@
dirhash.o version.o flushb.o unlink.o check_desc.o valid_blk.o \
ext_attr.o bmap.o dblist_dir.o ext2fs_inline.o swapfs.o
-CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/old_e2fsprogs/e2fsbb.h
diff -Naur busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/Kbuild busybox-1.14.3/e2fsprogs/old_e2fsprogs/Kbuild
--- busybox-1.14.3-orig/e2fsprogs/old_e2fsprogs/Kbuild 2009-07-29 01:33:00.000000000 +0200
+++ busybox-1.14.3/e2fsprogs/old_e2fsprogs/Kbuild 2009-08-16 22:45:03.000000000 +0200
@@ -13,4 +13,4 @@
lib-$(CONFIG_MKE2FS) += mke2fs.o util.o
lib-$(CONFIG_TUNE2FS) += tune2fs.o util.o
-CFLAGS += -include $(srctree)/e2fsprogs/e2fsbb.h
+CFLAGS += -include $(srctree)/e2fsprogs/old_e2fsprogs/e2fsbb.h
diff -Naur busybox-1.14.3-orig/include/applets.h busybox-1.14.3/include/applets.h
--- busybox-1.14.3-orig/include/applets.h 2009-08-02 20:17:33.000000000 +0200
+++ busybox-1.14.3/include/applets.h 2009-08-16 23:56:09.000000000 +0200
@@ -133,8 +134,8 @@
USE_DU(APPLET(du, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_DUMPKMAP(APPLET(dumpkmap, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_APP_DUMPLEASES(APPLET(dumpleases, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-//USE_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
-//USE_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, e2label))
+USE_E2FSCK(APPLET(e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, tune2fs))
USE_ECHO(APPLET_NOFORK(echo, echo, _BB_DIR_BIN, _BB_SUID_NEVER, echo))
USE_ED(APPLET(ed, _BB_DIR_BIN, _BB_SUID_NEVER))
USE_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER, egrep))
@@ -161,8 +162,8 @@
USE_FREE(APPLET(free, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_FREERAMDISK(APPLET(freeramdisk, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_FSCK(APPLET(fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
-//USE_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext2))
-//USE_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_ext3))
+USE_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, e2fsck))
+USE_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER, e2fsck))
USE_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_minix))
USE_FTPD(APPLET(ftpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpget))
@@ -251,10 +252,10 @@
USE_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_NEVER, mkdir))
USE_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_NEVER, mkfs_vfat))
-//USE_MKE2FS(APPLET(mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_MKE2FS(APPLET(mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_MKFIFO(APPLET(mkfifo, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-//USE_MKE2FS(APPLET_ODDNAME(mkfs.ext2, mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, mkfs_ext2))
-//USE_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, mkfs_ext3))
+USE_MKE2FS(APPLET_ODDNAME(mkfs.ext2, mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, mke2fs))
+USE_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, _BB_DIR_SBIN, _BB_SUID_NEVER, mke2fs))
USE_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, _BB_DIR_SBIN, _BB_SUID_NEVER, mkfs_minix))
USE_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_NEVER, mkfs_vfat))
USE_MKNOD(APPLET(mknod, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -389,7 +390,7 @@
USE_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
USE_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_NEVER))
-//USE_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
+USE_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_NEVER))
USE_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
USE_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER, udpsvd))
diff -Naur busybox-1.14.3-orig/Makefile busybox-1.14.3/Makefile
--- busybox-1.14.3-orig/Makefile 2009-08-02 20:18:49.000000000 +0200
+++ busybox-1.14.3/Makefile 2009-08-16 22:32:16.000000000 +0200
@@ -451,6 +451,11 @@
coreutils/libcoreutils/ \
debianutils/ \
e2fsprogs/ \
+ e2fsprogs/old_e2fsprogs/ \
+ e2fsprogs/old_e2fsprogs/e2p/ \
+ e2fsprogs/old_e2fsprogs/ext2fs/ \
+ e2fsprogs/old_e2fsprogs/blkid/ \
+ e2fsprogs/old_e2fsprogs/uuid/ \
editors/ \
findutils/ \
init/ \
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
