X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=7bdfda17e7ab5b967ac923935cbee08c7351e140;hp=3a7361a6ac6f032d64073ed9b0d5b41b0e51b414;hb=708cb3594139f28f7d99b4ea1cf91b4ccd032273;hpb=83cc6ab4760817509f1ed1ee429669e563f82caf diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 3a7361a6a..7bdfda17e 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -1,7 +1,7 @@ /* - * vol_id - udev callout to read filesystem label and uuid + * vol_id - read filesystem label and uuid * - * Copyright (C) 2005 Kay Sievers + * Copyright (C) 2005-2006 Kay Sievers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -63,10 +63,13 @@ void log_message(int priority, const char *format, ...) static void vid_log(int priority, const char *file, int line, const char *format, ...) { #ifdef USE_LOG + char log_str[1024]; va_list args; va_start(args, format); - log_message(priority, format, args); + vsnprintf(log_str, sizeof(log_str), format, args); + log_str[sizeof(log_str)-1] = '\0'; + log_message(priority, "%s:%i %s", file, line, log_str); va_end(args); #endif return; @@ -106,11 +109,14 @@ static void set_str(char *to, const char *from, size_t count) int main(int argc, char *argv[]) { - const char help[] = "usage: vol_id [--export|-t|-l|-u] \n" - " --export\n" - " -t filesystem type\n" - " -l filesystem label\n" - " -u filesystem uuid\n" + const char help[] = "Usage: vol_id [options] \n" + " --export export key/value pairs\n" + " -t filesystem type\n" + " -l filesystem label\n" + " -u filesystem uuid\n" + " --skip-raid don't probe for raid\n" + " --probe-all find possibly conflicting signatures\n" + " --help\n" "\n"; enum print_type { PRINT_EXPORT, @@ -122,15 +128,18 @@ int main(int argc, char *argv[]) static char name[VOLUME_ID_LABEL_SIZE]; int i; uint64_t size; + int skip_raid = 0; + int probe_all = 0; const char *node = NULL; uid_t nobody_uid; gid_t nobody_gid; + int retval; int rc = 0; logging_init("vol_id"); /* hook in our debug into libvolume_id */ - volume_id_log = vid_log; + volume_id_log_fn = vid_log; for (i = 1 ; i < argc; i++) { char *arg = argv[i]; @@ -143,6 +152,13 @@ int main(int argc, char *argv[]) print = PRINT_LABEL; } else if (strcmp(arg, "-u") == 0) { print = PRINT_UUID; + } else if (strcmp(arg, "--skip-raid") == 0) { + skip_raid = 1; + } else if (strcmp(arg, "--probe-all") == 0) { + probe_all = 1; + } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { + printf(help); + goto exit; } else node = arg; } @@ -176,15 +192,89 @@ int main(int argc, char *argv[]) } } - if (volume_id_probe_all(vid, 0, size) == 0) - goto print; + if (probe_all) { + if (volume_id_probe_linux_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_intel_software_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_via_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_nvidia_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_adaptec_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jmicron_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vfat(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_linux_swap(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_luks(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_xfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ext(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_reiserfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_udf(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_iso9660(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ufs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ntfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_cramfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_romfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hpfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_sysv(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_minix(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs1(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vxfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_squashfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_netware(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); + + goto exit; + } - if (print != PRINT_EXPORT) + if (skip_raid) + retval = volume_id_probe_filesystem(vid, 0, size); + else + retval = volume_id_probe_all(vid, 0, size); + if (retval != 0) { fprintf(stderr, "%s: unknown volume type\n", node); - rc = 4; - goto exit; + rc = 4; + goto exit; + } -print: set_str(name, vid->label, sizeof(vid->label)); replace_untrusted_chars(name); @@ -201,15 +291,14 @@ print: printf("%s\n", vid->type); break; case PRINT_LABEL: - if (name[0] == '\0' || - (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) { + if (name[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 3; goto exit; } printf("%s\n", name); break; case PRINT_UUID: - if (vid->uuid[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) { + if (vid->uuid[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 4; goto exit; }