From owner-svn-src-all@FreeBSD.ORG  Sat Mar  2 16:18:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 06263619;
 Sat,  2 Mar 2013 16:18:41 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E1959607;
 Sat,  2 Mar 2013 16:18:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22GIet5051489;
 Sat, 2 Mar 2013 16:18:40 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22GIeYv051488;
 Sat, 2 Mar 2013 16:18:40 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201303021618.r22GIeYv051488@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 2 Mar 2013 16:18:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247634 - stable/9/usr.sbin/sysinstall
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Mar 2013 16:18:41 -0000

Author: dteske
Date: Sat Mar  2 16:18:40 2013
New Revision: 247634
URL: http://svnweb.freebsd.org/changeset/base/247634

Log:
  Update FTP directories to include new layout. Previously discussed with
  kensmith and others as this alleviates the need for the symbolic link upkeep
  which is currently manually maintained.

Modified:
  stable/9/usr.sbin/sysinstall/ftp.c

Modified: stable/9/usr.sbin/sysinstall/ftp.c
==============================================================================
--- stable/9/usr.sbin/sysinstall/ftp.c	Sat Mar  2 16:07:55 2013	(r247633)
+++ stable/9/usr.sbin/sysinstall/ftp.c	Sat Mar  2 16:18:40 2013	(r247634)
@@ -50,8 +50,12 @@ int FtpPort;
 
 /* List of sub directories to look for under a given FTP server. */
 const char *ftp_dirs[] = { ".", "releases/"MACHINE, "snapshots/"MACHINE,
+    "releases/"MACHINE"/"MACHINE_ARCH, "snapshots/"MACHINE"/"MACHINE_ARCH,
     "pub/FreeBSD", "pub/FreeBSD/releases/"MACHINE,
-    "pub/FreeBSD/snapshots/"MACHINE, NULL };
+    "pub/FreeBSD/snapshots/"MACHINE,
+    "pub/FreeBSD/releases/"MACHINE"/"MACHINE_ARCH,
+    "pub/FreeBSD/snapshots/"MACHINE"/"MACHINE_ARCH,
+    NULL };
 
 /* Brings up attached network device, if any - takes FTP device as arg */
 static Boolean