emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tune2fs: move to e2fsprogs

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-05-09 00:13:40 +02:00
parent 19afe848ec
commit 6774386d95
8 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
util-linux/Kbuild
View File

@ -42,5 +42,4 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o
lib-$(CONFIG_SETARCH) += setarch.o
lib-$(CONFIG_SWAPONOFF) += swaponoff.o
lib-$(CONFIG_SWITCH_ROOT) += switch_root.o
lib-$(CONFIG_MKFS_EXT2) += tune2fs.o
lib-$(CONFIG_UMOUNT) += umount.o

7
util-linux/mkfs_ext2.c
View File

@ -10,7 +10,6 @@
#include "libbb.h"
#include <linux/fs.h>
#include <linux/ext2_fs.h>
#include "volume_id/volume_id_internal.h"
#define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
#define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1
@ -29,9 +28,9 @@ char BUG_wrong_field_size(void);
#define STORE_LE(field, value) \
do { \
if (sizeof(field) == 4) \
field = cpu_to_le32(value); \
field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \
field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \
field = (value); \
else \
@ -39,7 +38,7 @@ do { \
} while (0)
#define FETCH_LE32(field) \
(sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size())
(sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
// All fields are little-endian
struct ext2_dir {

7
util-linux/mkfs_reiser.c
View File

@ -8,15 +8,14 @@
*/
#include "libbb.h"
#include <linux/fs.h>
#include "volume_id/volume_id_internal.h"
char BUG_wrong_field_size(void);
#define STORE_LE(field, value) \
do { \
if (sizeof(field) == 4) \
field = cpu_to_le32(value); \
field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \
field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \
field = (value); \
else \
@ -24,7 +23,7 @@ do { \
} while (0)
#define FETCH_LE32(field) \
(sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size())
(sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size())
struct journal_params {
uint32_t jp_journal_1st_block; /* where does journal start from on its device */

7
util-linux/mkfs_vfat.c
View File

@ -16,7 +16,6 @@
# define BLKSSZGET _IO(0x12, 104)
#endif
//#include <linux/msdos_fs.h>
#include "volume_id/volume_id_internal.h"
#define SECTOR_SIZE 512
@ -168,15 +167,15 @@ static const char boot_code[] ALIGN1 =
#define MARK_CLUSTER(cluster, value) \
((uint32_t *)fat)[cluster] = cpu_to_le32(value)
((uint32_t *)fat)[cluster] = SWAP_LE32(value)
void BUG_unsupported_field_size(void);
#define STORE_LE(field, value) \
do { \
if (sizeof(field) == 4) \
field = cpu_to_le32(value); \
field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \
field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \
field = (value); \
else \

71
util-linux/tune2fs.c
View File

@ -1,71 +0,0 @@
/* vi: set sw=4 ts=4: */
/*
* tune2fs: utility to modify EXT2 filesystem
*
* Busybox'ed (2009) by Vladimir Dronnikov <dronnikov@gmail.com>
*
* Licensed under GPLv2, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
#include <linux/fs.h>
#include <linux/ext2_fs.h>
#include "volume_id/volume_id_internal.h"
// storage helpers
char BUG_wrong_field_size(void);
#define STORE_LE(field, value) \
do { \
if (sizeof(field) == 4) \
field = cpu_to_le32(value); \
else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \
else if (sizeof(field) == 1) \
field = (value); \
else \
BUG_wrong_field_size(); \
} while (0)
#define FETCH_LE32(field) \
(sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size())
enum {
OPT_L = 1 << 0, // label
};
int tune2fs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int tune2fs_main(int argc UNUSED_PARAM, char **argv)
{
unsigned opts;
const char *label;
struct ext2_super_block *sb;
int fd;
opt_complementary = "=1";
opts = getopt32(argv, "L:", &label);
argv += optind; // argv[0] -- device
if (!opts)
bb_show_usage();
// read superblock
fd = xopen(argv[0], O_RDWR);
xlseek(fd, 1024, SEEK_SET);
sb = xzalloc(1024);
xread(fd, sb, 1024);
// mangle superblock
//STORE_LE(sb->s_wtime, time(NULL)); - why bother?
// set the label
if (1 /*opts & OPT_L*/)
safe_strncpy((char *)sb->s_volume_name, label, sizeof(sb->s_volume_name));
// write superblock
xlseek(fd, 1024, SEEK_SET);
xwrite(fd, sb, 1024);
if (ENABLE_FEATURE_CLEAN_UP) {
free(sb);
}
xclose(fd);
return EXIT_SUCCESS;
}