Date: Sat, 2 Jul 2011 18:43:35 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r223725 - stable/8/sbin/geom/class/part Message-ID: <201107021843.p62IhZOq051489@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Sat Jul 2 18:43:35 2011 New Revision: 223725 URL: http://svn.freebsd.org/changeset/base/223725 Log: Since head/ and stable/8 have different handling for geom control request parameters, r215941 should be modified to allow use -F option in the "gpart restore" command - "force" parameter should be ascii string. This is direct commit to stable/8. Reported by: Maxim Ignatenko Modified: stable/8/sbin/geom/class/part/geom_part.c Modified: stable/8/sbin/geom/class/part/geom_part.c ============================================================================== --- stable/8/sbin/geom/class/part/geom_part.c Sat Jul 2 16:20:58 2011 (r223724) +++ stable/8/sbin/geom/class/part/geom_part.c Sat Jul 2 18:43:35 2011 (r223725) @@ -828,8 +828,8 @@ gpart_restore(struct gctl_req *req, unsi classp->lg_name); gctl_ro_param(r, "verb", -1, "destroy"); gctl_ro_param(r, "flags", -1, "restore"); - gctl_ro_param(r, "force", sizeof(forced), - &forced); + gctl_ro_param(r, "force", -1, + forced ? "1": "0"); gctl_ro_param(r, "geom", -1, s); errstr = gctl_issue(r); if (errstr != NULL && errstr[0] != '\0') {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107021843.p62IhZOq051489>