From owner-svn-src-projects@FreeBSD.ORG Wed Oct 23 16:59:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D8A60280; Wed, 23 Oct 2013 16:59:00 +0000 (UTC) (envelope-from will@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B788A2D97; Wed, 23 Oct 2013 16:59:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NGx02K057938; Wed, 23 Oct 2013 16:59:00 GMT (envelope-from will@svn.freebsd.org) Received: (from will@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NGx03d057937; Wed, 23 Oct 2013 16:59:00 GMT (envelope-from will@svn.freebsd.org) Message-Id: <201310231659.r9NGx03d057937@svn.freebsd.org> From: Will Andrews Date: Wed, 23 Oct 2013 16:59:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256986 - projects/vps/usr.sbin/vpsctl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 16:59:01 -0000 Author: will Date: Wed Oct 23 16:59:00 2013 New Revision: 256986 URL: http://svnweb.freebsd.org/changeset/base/256986 Log: Sync with svn.7he.at/vps/trunk r188. r188 | klaus | 2013-07-09 07:37:55 -0600 (Tue, 09 Jul 2013) | 4 lines vpsctl: additional rsync flags (preserve extended attributes, hardlinks, ACLs); create vps mountpoint directory when doing ''onersync'', too. Submitted by: Klaus P. Ohrhallinger Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c Modified: projects/vps/usr.sbin/vpsctl/vpsctl.c ============================================================================== --- projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 16:58:04 2013 (r256985) +++ projects/vps/usr.sbin/vpsctl/vpsctl.c Wed Oct 23 16:59:00 2013 (r256986) @@ -1358,21 +1358,23 @@ vc_migrate(int argc, char **argv) fprintf(stderr, "done\n"); - if (f_onersync == 0) { + /* Always create directories. */ + if (vc.fsroot_priv[0] != '\0') { + /* Create vps' private root directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); + write(wfd, cmd, strlen(cmd)); + //len = read(rfd, cmd, sizeof(cmd)); + } + /* Create vps' mountpoint directory. */ + snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); + write(wfd, cmd, strlen(cmd)); + //len = read(rfd, cmd, sizeof(cmd)); - fprintf(stderr, "Performing first filesystem sync ... "); + if (f_onersync == 0) { /* Start a first filesystem sync while vps is still running. */ - if (vc.fsroot_priv[0] != '\0') { - /* Create vps' private root directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot_priv); - write(wfd, cmd, strlen(cmd)); - //len = read(rfd, cmd, sizeof(cmd)); - } - /* Create vps' mountpoint directory. */ - snprintf(cmd, sizeof(cmd), "mkdir -p %s\n", vc.fsroot); - write(wfd, cmd, strlen(cmd)); - //len = read(rfd, cmd, sizeof(cmd)); + + fprintf(stderr, "Performing first filesystem sync ... "); snprintf(cmd, sizeof(cmd), "vpsctl rsyncserver %s/\n", fsroot); write(wfd, cmd, strlen(cmd)); @@ -1608,16 +1610,20 @@ vc_sshtest(int argc, char **argv) * The rsync program that is used here is slightly adapted to allow * write/read from/to its stdin/stdout. */ +/* + * XXX Somehow rsync doesn't work properly with --numeric-ids specified. + */ int vc_rsync(int mode, int rfd, int wfd, char *path) { - char *argv[7]; + char *argv[8]; char str_rsync[] = "/usr/sbin/rsync_vps"; - char str_flagscl[] = "-xae"; + char str_flagscl[] = "-xaHAXe"; char str_dash[] = "-"; char str_server[] = "--server"; - char str_flagssv[] = "-logDtprxe.iLf"; + char str_flagssv[] = "-logDtprxHAXe.iLf"; char str_delete[] = "--delete"; + //char str_numericids[] = "--numeric-ids"; char str_dot[] = "."; int oflags_rfd; int oflags_wfd; @@ -1653,6 +1659,7 @@ vc_rsync(int mode, int rfd, int wfd, cha argv[0] = str_rsync; argv[1] = str_delete; + //argv[2] = str_numericids; argv[2] = str_flagscl; argv[3] = str_dash; argv[4] = path; @@ -1664,6 +1671,7 @@ vc_rsync(int mode, int rfd, int wfd, cha argv[1] = str_server; argv[2] = str_flagssv; argv[3] = str_delete; + //argv[4] = str_numericids; argv[4] = str_dot; argv[5] = path; argv[6] = NULL;