Date: Sun, 25 Jan 2009 19:35:24 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r187697 - stable/7/sbin/atacontrol Message-ID: <200901251935.n0PJZORx026092@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Jan 25 19:35:23 2009 New Revision: 187697 URL: http://svn.freebsd.org/changeset/base/187697 Log: MFC r181349 to stable/7: Make atacontrol(8) rebuild work when /usr is not mounted or from /rescue PR: bin/125680 MFC after: 1 month Tested by: Stef Walter Modified: stable/7/sbin/atacontrol/ (props changed) stable/7/sbin/atacontrol/atacontrol.c Modified: stable/7/sbin/atacontrol/atacontrol.c ============================================================================== --- stable/7/sbin/atacontrol/atacontrol.c Sun Jan 25 19:25:41 2009 (r187696) +++ stable/7/sbin/atacontrol/atacontrol.c Sun Jan 25 19:35:23 2009 (r187697) @@ -37,6 +37,7 @@ #include <stdlib.h> #include <string.h> #include <sysexits.h> +#include <unistd.h> static const char * mode2str(int mode) @@ -517,12 +518,30 @@ main(int argc, char **argv) if (ioctl(fd, IOCATARAIDREBUILD, &array) < 0) warn("ioctl(IOCATARAIDREBUILD)"); else { - char buffer[128]; - sprintf(buffer, "/usr/bin/nice -n 20 /bin/dd " - "if=/dev/ar%d of=/dev/null bs=1m &", - array); - if (system(buffer)) - warn("background dd"); + char device[64]; + char *buffer; + ssize_t len; + int arfd; + + if (daemon(0, 1) == -1) + err(1, "daemon"); + nice(20); + snprintf(device, sizeof(device), "/dev/ar%d", + array); + if ((arfd = open(device, O_RDONLY)) == -1) + err(1, "open %s", device); + if ((buffer = malloc(1024 * 1024)) == NULL) + err(1, "malloc"); + while ((len = read(arfd, buffer, 1024 * 1024)) > 0) + ; + if (len == -1) + err(1, "read"); + else + fprintf(stderr, + "atacontrol: ar%d rebuild completed\n", + array); + free(buffer); + close(arfd); } exit(EX_OK); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901251935.n0PJZORx026092>