diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-09 00:13:40 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-09 00:13:40 +0200 |
commit | 6774386d95cec54258f23f69bc287c99e205ebdf (patch) | |
tree | 51a81051eb233a15e6107579c8573ecec5b09726 | |
parent | 19afe848eca8d3baf149cd7ed715489403360287 (diff) | |
download | busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.gz busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.tar.bz2 busybox-w32-6774386d95cec54258f23f69bc287c99e205ebdf.zip |
tune2fs: move to e2fsprogs
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | e2fsprogs/Config.in | 12 | ||||
-rw-r--r-- | e2fsprogs/Kbuild | 3 | ||||
-rw-r--r-- | e2fsprogs/tune2fs.c (renamed from util-linux/tune2fs.c) | 7 | ||||
-rw-r--r-- | include/applets.h | 2 | ||||
-rw-r--r-- | util-linux/Kbuild | 1 | ||||
-rw-r--r-- | util-linux/mkfs_ext2.c | 7 | ||||
-rw-r--r-- | util-linux/mkfs_reiser.c | 7 | ||||
-rw-r--r-- | util-linux/mkfs_vfat.c | 7 |
8 files changed, 21 insertions, 25 deletions
diff --git a/e2fsprogs/Config.in b/e2fsprogs/Config.in index 9a0088ab5..964d08e4c 100644 --- a/e2fsprogs/Config.in +++ b/e2fsprogs/Config.in | |||
@@ -41,12 +41,12 @@ config LSATTR | |||
41 | ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat | 41 | ### mke2fs is used to create an ext2/ext3 filesystem. The normal compat |
42 | ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. | 42 | ### symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided. |
43 | 43 | ||
44 | ### config TUNE2FS | 44 | config TUNE2FS |
45 | ### bool "tune2fs" | 45 | bool "tune2fs" |
46 | ### default n | 46 | default n |
47 | ### help | 47 | help |
48 | ### tune2fs allows the system administrator to adjust various tunable | 48 | tune2fs allows the system administrator to adjust various tunable |
49 | ### filesystem parameters on Linux ext2/ext3 filesystems. | 49 | filesystem parameters on Linux ext2/ext3 filesystems. |
50 | 50 | ||
51 | ### config E2LABEL | 51 | ### config E2LABEL |
52 | ### bool "e2label" | 52 | ### bool "e2label" |
diff --git a/e2fsprogs/Kbuild b/e2fsprogs/Kbuild index 9f58ce092..0fdc9d215 100644 --- a/e2fsprogs/Kbuild +++ b/e2fsprogs/Kbuild | |||
@@ -9,4 +9,5 @@ lib-y:= | |||
9 | lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o | 9 | lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o |
10 | lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o | 10 | lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o |
11 | 11 | ||
12 | lib-$(CONFIG_FSCK) += fsck.o | 12 | lib-$(CONFIG_FSCK) += fsck.o |
13 | lib-$(CONFIG_TUNE2FS) += tune2fs.o | ||
diff --git a/util-linux/tune2fs.c b/e2fsprogs/tune2fs.c index 3b8f3d8ef..00ede4f1e 100644 --- a/util-linux/tune2fs.c +++ b/e2fsprogs/tune2fs.c | |||
@@ -9,16 +9,15 @@ | |||
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
11 | #include <linux/ext2_fs.h> | 11 | #include <linux/ext2_fs.h> |
12 | #include "volume_id/volume_id_internal.h" | ||
13 | 12 | ||
14 | // storage helpers | 13 | // storage helpers |
15 | char BUG_wrong_field_size(void); | 14 | char BUG_wrong_field_size(void); |
16 | #define STORE_LE(field, value) \ | 15 | #define STORE_LE(field, value) \ |
17 | do { \ | 16 | do { \ |
18 | if (sizeof(field) == 4) \ | 17 | if (sizeof(field) == 4) \ |
19 | field = cpu_to_le32(value); \ | 18 | field = SWAP_LE32(value); \ |
20 | else if (sizeof(field) == 2) \ | 19 | else if (sizeof(field) == 2) \ |
21 | field = cpu_to_le16(value); \ | 20 | field = SWAP_LE16(value); \ |
22 | else if (sizeof(field) == 1) \ | 21 | else if (sizeof(field) == 1) \ |
23 | field = (value); \ | 22 | field = (value); \ |
24 | else \ | 23 | else \ |
@@ -26,7 +25,7 @@ do { \ | |||
26 | } while (0) | 25 | } while (0) |
27 | 26 | ||
28 | #define FETCH_LE32(field) \ | 27 | #define FETCH_LE32(field) \ |
29 | (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) | 28 | (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) |
30 | 29 | ||
31 | enum { | 30 | enum { |
32 | OPT_L = 1 << 0, // label | 31 | OPT_L = 1 << 0, // label |
diff --git a/include/applets.h b/include/applets.h index 6d7af5253..36b24856a 100644 --- a/include/applets.h +++ b/include/applets.h | |||
@@ -405,7 +405,7 @@ IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true)) | |||
405 | IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 405 | IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
406 | IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 406 | IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP)) |
407 | IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) | 407 | IF_TUNCTL(APPLET(tunctl, _BB_DIR_SBIN, _BB_SUID_DROP)) |
408 | IF_MKFS_EXT2(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) | 408 | IF_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_DROP)) |
409 | IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) | 409 | IF_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_DROP)) |
410 | IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) | 410 | IF_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) |
411 | IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd)) | 411 | IF_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_DROP, udpsvd)) |
diff --git a/util-linux/Kbuild b/util-linux/Kbuild index 99e3efea3..4fa392398 100644 --- a/util-linux/Kbuild +++ b/util-linux/Kbuild | |||
@@ -42,5 +42,4 @@ lib-$(CONFIG_SCRIPTREPLAY) += scriptreplay.o | |||
42 | lib-$(CONFIG_SETARCH) += setarch.o | 42 | lib-$(CONFIG_SETARCH) += setarch.o |
43 | lib-$(CONFIG_SWAPONOFF) += swaponoff.o | 43 | lib-$(CONFIG_SWAPONOFF) += swaponoff.o |
44 | lib-$(CONFIG_SWITCH_ROOT) += switch_root.o | 44 | lib-$(CONFIG_SWITCH_ROOT) += switch_root.o |
45 | lib-$(CONFIG_MKFS_EXT2) += tune2fs.o | ||
46 | lib-$(CONFIG_UMOUNT) += umount.o | 45 | lib-$(CONFIG_UMOUNT) += umount.o |
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index cf40c20eb..fd54734fc 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
11 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
12 | #include <linux/ext2_fs.h> | 12 | #include <linux/ext2_fs.h> |
13 | #include "volume_id/volume_id_internal.h" | ||
14 | 13 | ||
15 | #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 | 14 | #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0 |
16 | #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 | 15 | #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX 1 |
@@ -29,9 +28,9 @@ char BUG_wrong_field_size(void); | |||
29 | #define STORE_LE(field, value) \ | 28 | #define STORE_LE(field, value) \ |
30 | do { \ | 29 | do { \ |
31 | if (sizeof(field) == 4) \ | 30 | if (sizeof(field) == 4) \ |
32 | field = cpu_to_le32(value); \ | 31 | field = SWAP_LE32(value); \ |
33 | else if (sizeof(field) == 2) \ | 32 | else if (sizeof(field) == 2) \ |
34 | field = cpu_to_le16(value); \ | 33 | field = SWAP_LE16(value); \ |
35 | else if (sizeof(field) == 1) \ | 34 | else if (sizeof(field) == 1) \ |
36 | field = (value); \ | 35 | field = (value); \ |
37 | else \ | 36 | else \ |
@@ -39,7 +38,7 @@ do { \ | |||
39 | } while (0) | 38 | } while (0) |
40 | 39 | ||
41 | #define FETCH_LE32(field) \ | 40 | #define FETCH_LE32(field) \ |
42 | (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) | 41 | (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) |
43 | 42 | ||
44 | // All fields are little-endian | 43 | // All fields are little-endian |
45 | struct ext2_dir { | 44 | struct ext2_dir { |
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index eb2c94d02..f9a0ca82a 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c | |||
@@ -8,15 +8,14 @@ | |||
8 | */ | 8 | */ |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
11 | #include "volume_id/volume_id_internal.h" | ||
12 | 11 | ||
13 | char BUG_wrong_field_size(void); | 12 | char BUG_wrong_field_size(void); |
14 | #define STORE_LE(field, value) \ | 13 | #define STORE_LE(field, value) \ |
15 | do { \ | 14 | do { \ |
16 | if (sizeof(field) == 4) \ | 15 | if (sizeof(field) == 4) \ |
17 | field = cpu_to_le32(value); \ | 16 | field = SWAP_LE32(value); \ |
18 | else if (sizeof(field) == 2) \ | 17 | else if (sizeof(field) == 2) \ |
19 | field = cpu_to_le16(value); \ | 18 | field = SWAP_LE16(value); \ |
20 | else if (sizeof(field) == 1) \ | 19 | else if (sizeof(field) == 1) \ |
21 | field = (value); \ | 20 | field = (value); \ |
22 | else \ | 21 | else \ |
@@ -24,7 +23,7 @@ do { \ | |||
24 | } while (0) | 23 | } while (0) |
25 | 24 | ||
26 | #define FETCH_LE32(field) \ | 25 | #define FETCH_LE32(field) \ |
27 | (sizeof(field) == 4 ? cpu_to_le32(field) : BUG_wrong_field_size()) | 26 | (sizeof(field) == 4 ? SWAP_LE32(field) : BUG_wrong_field_size()) |
28 | 27 | ||
29 | struct journal_params { | 28 | struct journal_params { |
30 | uint32_t jp_journal_1st_block; /* where does journal start from on its device */ | 29 | uint32_t jp_journal_1st_block; /* where does journal start from on its device */ |
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index 1363612f2..ff3e4165a 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c | |||
@@ -16,7 +16,6 @@ | |||
16 | # define BLKSSZGET _IO(0x12, 104) | 16 | # define BLKSSZGET _IO(0x12, 104) |
17 | #endif | 17 | #endif |
18 | //#include <linux/msdos_fs.h> | 18 | //#include <linux/msdos_fs.h> |
19 | #include "volume_id/volume_id_internal.h" | ||
20 | 19 | ||
21 | #define SECTOR_SIZE 512 | 20 | #define SECTOR_SIZE 512 |
22 | 21 | ||
@@ -168,15 +167,15 @@ static const char boot_code[] ALIGN1 = | |||
168 | 167 | ||
169 | 168 | ||
170 | #define MARK_CLUSTER(cluster, value) \ | 169 | #define MARK_CLUSTER(cluster, value) \ |
171 | ((uint32_t *)fat)[cluster] = cpu_to_le32(value) | 170 | ((uint32_t *)fat)[cluster] = SWAP_LE32(value) |
172 | 171 | ||
173 | void BUG_unsupported_field_size(void); | 172 | void BUG_unsupported_field_size(void); |
174 | #define STORE_LE(field, value) \ | 173 | #define STORE_LE(field, value) \ |
175 | do { \ | 174 | do { \ |
176 | if (sizeof(field) == 4) \ | 175 | if (sizeof(field) == 4) \ |
177 | field = cpu_to_le32(value); \ | 176 | field = SWAP_LE32(value); \ |
178 | else if (sizeof(field) == 2) \ | 177 | else if (sizeof(field) == 2) \ |
179 | field = cpu_to_le16(value); \ | 178 | field = SWAP_LE16(value); \ |
180 | else if (sizeof(field) == 1) \ | 179 | else if (sizeof(field) == 1) \ |
181 | field = (value); \ | 180 | field = (value); \ |
182 | else \ | 181 | else \ |