diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:25:05 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:25:05 +0000 |
| commit | d25c33f186c7cf3618c34ce79af94fe156f9ab02 (patch) | |
| tree | a857a6c68d383075e36bde3b3f38b33ce41ab71c /util-linux/volume_id/volume_id.c | |
| parent | c5b737231debe51edb769a0b5667ee9719e560e0 (diff) | |
| download | busybox-d25c33f186c7cf3618c34ce79af94fe156f9ab02.tar.gz | |
volume_id: disable detection routines which are not setting label and uuid anyway
function old new delta
static.warn 1 - -1
static.drive_name_string 14 12 -2
static.offsets 8 - -8
static.sectors 10 - -10
fs2 60 48 -12
raid2 16 - -16
uuidcache_init 704 677 -27
raid1 32 - -32
volume_id_probe_all 198 158 -40
volume_id_probe_lvm1 58 - -58
volume_id_probe_highpoint_37x_raid 63 - -63
volume_id_probe_hpfs 67 - -67
volume_id_probe_minix 74 - -74
volume_id_probe_lvm2 78 - -78
volume_id_probe_silicon_medley_raid 97 - -97
volume_id_probe_via_raid 101 - -101
volume_id_probe_highpoint_45x_raid 104 - -104
volume_id_probe_nvidia_raid 108 - -108
volume_id_probe_lsi_mega_raid 108 - -108
volume_id_probe_intel_software_raid 108 - -108
volume_id_probe_ufs 126 - -126
volume_id_probe_promise_fasttrack_raid 144 - -144
------------------------------------------------------------------------------
(add/remove: 0/18 grow/shrink: 0/4 up/down: 0/-1384) Total: -1384 bytes
text data bss dec hex filename
794244 662 7420 802326 c3e16 busybox_old
792698 662 7420 800780 c380c busybox_unstripped
Diffstat (limited to 'util-linux/volume_id/volume_id.c')
| -rw-r--r-- | util-linux/volume_id/volume_id.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c index a26e2bcf0..de9aae2ce 100644 --- a/util-linux/volume_id/volume_id.c +++ b/util-linux/volume_id/volume_id.c @@ -20,6 +20,31 @@ #include "volume_id_internal.h" + +/* Some detection routines do not set label or uuid anyway, + * so they are disabled. */ + +/* Looks for partitions, we don't use it: */ +#define ENABLE_FEATURE_VOLUMEID_MAC 0 +/* #define ENABLE_FEATURE_VOLUMEID_MSDOS 0 - NB: this one + * was not properly added to probe table anyway - ??! */ + +/* None of RAIDs have label or uuid, except LinuxRAID: */ +#define ENABLE_FEATURE_VOLUMEID_HIGHPOINTRAID 0 +#define ENABLE_FEATURE_VOLUMEID_ISWRAID 0 +#define ENABLE_FEATURE_VOLUMEID_LSIRAID 0 +#define ENABLE_FEATURE_VOLUMEID_LVM 0 +#define ENABLE_FEATURE_VOLUMEID_NVIDIARAID 0 +#define ENABLE_FEATURE_VOLUMEID_PROMISERAID 0 +#define ENABLE_FEATURE_VOLUMEID_SILICONRAID 0 +#define ENABLE_FEATURE_VOLUMEID_VIARAID 0 + +/* These filesystems also have no label or uuid: */ +#define ENABLE_FEATURE_VOLUMEID_MINIX 0 +#define ENABLE_FEATURE_VOLUMEID_HPFS 0 +#define ENABLE_FEATURE_VOLUMEID_UFS 0 + + typedef int (*raid_probe_fptr)(struct volume_id *id, uint64_t off, uint64_t size); typedef int (*probe_fptr)(struct volume_id *id, uint64_t off); @@ -68,10 +93,9 @@ static const probe_fptr fs1[] = { #if ENABLE_FEATURE_VOLUMEID_FAT volume_id_probe_vfat, #endif -// This one only looks for partitions, we don't use it -//#if ENABLE_FEATURE_VOLUMEID_MAC -// volume_id_probe_mac_partition_map, -//#endif +#if ENABLE_FEATURE_VOLUMEID_MAC + volume_id_probe_mac_partition_map, +#endif #if ENABLE_FEATURE_VOLUMEID_XFS volume_id_probe_xfs, #endif |