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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2fsprogs/Config.in
View File

@ -41,12 +41,12 @@ config LSATTR
### mke2fs is used to create an ext2/ext3 filesystem. The normal compat ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat
### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
### config TUNE2FS config TUNE2FS
### bool "tune2fs" bool "tune2fs"
### default n default n
### help help
### tune2fs allows the system administrator to adjust various tunable tune2fs allows the system administrator to adjust various tunable
### filesystem parameters on Linux ext2/ext3 filesystems. filesystem parameters on Linux ext2/ext3 filesystems.
### config E2LABEL ### config E2LABEL
### bool "e2label" ### bool "e2label"

1
e2fsprogs/Kbuild
View File

@ -10,3 +10,4 @@ lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
lib-$(CONFIG_FSCK) += fsck.o lib-$(CONFIG_FSCK) += fsck.o
lib-$(CONFIG_TUNE2FS) += tune2fs.o

7
util-linux/tune2fs.c → e2fsprogs/tune2fs.c
View File

@ -9,16 +9,15 @@
#include "libbb.h" #include "libbb.h"
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/ext2_fs.h> #include <linux/ext2_fs.h>
#include "volume_id/volume_id_internal.h"
// storage helpers // storage helpers
char BUG_wrong_field_size(void); char BUG_wrong_field_size(void);
#define STORE_LE(field, value) \ #define STORE_LE(field, value) \
do { \ do { \
if (sizeof(field) == 4) \ if (sizeof(field) == 4) \
field = cpu_to_le32(value); \ field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \ else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \ field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \ else if (sizeof(field) == 1) \
field = (value); \ field = (value); \
else \ else \
@ -26,7 +25,7 @@ do { \
} while (0) } while (0)
#define FETCH_LE32(field) \ #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())
enum { enum {
OPT_L = 1 << 0, // label OPT_L = 1 << 0, // label

2
include/applets.h
View File

@ -405,7 +405,7 @@ IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true))
IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP))
IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP))
IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP))
IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd)) IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd))

1
util-linux/Kbuild
View File

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

7
util-linux/mkfs_ext2.c
View File

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

7
util-linux/mkfs_reiser.c
View File

@ -8,15 +8,14 @@
*/ */
#include "libbb.h" #include "libbb.h"
#include <linux/fs.h> #include <linux/fs.h>
#include "volume_id/volume_id_internal.h"
char BUG_wrong_field_size(void); char BUG_wrong_field_size(void);
#define STORE_LE(field, value) \ #define STORE_LE(field, value) \
do { \ do { \
if (sizeof(field) == 4) \ if (sizeof(field) == 4) \
field = cpu_to_le32(value); \ field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \ else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \ field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \ else if (sizeof(field) == 1) \
field = (value); \ field = (value); \
else \ else \
@ -24,7 +23,7 @@ do { \
} while (0) } while (0)
#define FETCH_LE32(field) \ #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 { struct journal_params {
uint32_t jp_journal_1st_block; /* where does journal start from on its device */ 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) # define BLKSSZGET _IO(0x12, 104)
#endif #endif
//#include <linux/msdos_fs.h> //#include <linux/msdos_fs.h>
#include "volume_id/volume_id_internal.h"
#define SECTOR_SIZE 512 #define SECTOR_SIZE 512
@ -168,15 +167,15 @@ static const char boot_code[] ALIGN1 =
#define MARK_CLUSTER(cluster, value) \ #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); void BUG_unsupported_field_size(void);
#define STORE_LE(field, value) \ #define STORE_LE(field, value) \
do { \ do { \
if (sizeof(field) == 4) \ if (sizeof(field) == 4) \
field = cpu_to_le32(value); \ field = SWAP_LE32(value); \
else if (sizeof(field) == 2) \ else if (sizeof(field) == 2) \
field = cpu_to_le16(value); \ field = SWAP_LE16(value); \
else if (sizeof(field) == 1) \ else if (sizeof(field) == 1) \
field = (value); \ field = (value); \
else \ else \