From owner-svn-src-user@FreeBSD.ORG Sun Jan 16 18:46:17 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CB921065670; Sun, 16 Jan 2011 18:46:17 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7AAD58FC12; Sun, 16 Jan 2011 18:46:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GIkHWJ073342; Sun, 16 Jan 2011 18:46:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GIkHXe073337; Sun, 16 Jan 2011 18:46:17 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101161846.p0GIkHXe073337@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 16 Jan 2011 18:46:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217480 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 18:46:17 -0000 Author: nwhitehorn Date: Sun Jan 16 18:46:17 2011 New Revision: 217480 URL: http://svn.freebsd.org/changeset/base/217480 Log: Improve the robustness of the partition wizard. Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c user/nwhitehorn/bsdinstall/partedit/part_wizard.c user/nwhitehorn/bsdinstall/partedit/partedit.c user/nwhitehorn/bsdinstall/partedit/partedit.h Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 16 18:04:01 2011 (r217479) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 16 18:46:17 2011 (r217480) @@ -517,6 +517,105 @@ set_default_part_metadata(const char *na } } +static +int part_compare(const void *xa, const void *xb) +{ + struct gprovider **a = (struct gprovider **)xa; + struct gprovider **b = (struct gprovider **)xb; + intmax_t astart, bstart; + struct gconfig *gc; + + astart = bstart = 0; + LIST_FOREACH(gc, &(*a)->lg_config, lg_config) + if (strcmp(gc->lg_name, "start") == 0) { + astart = strtoimax(gc->lg_val, NULL, 0); + break; + } + LIST_FOREACH(gc, &(*b)->lg_config, lg_config) + if (strcmp(gc->lg_name, "start") == 0) { + bstart = strtoimax(gc->lg_val, NULL, 0); + break; + } + + if (astart < bstart) + return -1; + else if (astart > bstart) + return 1; + else + return 0; +} + +intmax_t +gpart_max_free(struct ggeom *geom, intmax_t *npartstart) +{ + struct gconfig *gc; + struct gprovider *pp, **providers; + intmax_t lastend; + intmax_t start, end; + intmax_t maxsize, maxstart; + intmax_t partstart, partend; + int i, nparts; + + /* Now get the maximum free size and free start */ + start = end = 0; + LIST_FOREACH(gc, &geom->lg_config, lg_config) { + if (strcmp(gc->lg_name, "first") == 0) + start = strtoimax(gc->lg_val, NULL, 0); + if (strcmp(gc->lg_name, "last") == 0) + end = strtoimax(gc->lg_val, NULL, 0); + } + + i = nparts = 0; + LIST_FOREACH(pp, &geom->lg_provider, lg_provider) + nparts++; + providers = calloc(nparts, sizeof(providers[0])); + LIST_FOREACH(pp, &geom->lg_provider, lg_provider) + providers[i++] = pp; + qsort(providers, nparts, sizeof(providers[0]), part_compare); + + lastend = start - 1; + maxsize = 0; + for (i = 0; i < nparts; i++) { + pp = providers[i]; + + LIST_FOREACH(gc, &pp->lg_config, lg_config) { + if (strcmp(gc->lg_name, "start") == 0) + partstart = strtoimax(gc->lg_val, NULL, 0); + if (strcmp(gc->lg_name, "end") == 0) + partend = strtoimax(gc->lg_val, NULL, 0); + } + + if (partstart - lastend > maxsize) { + maxsize = partstart - lastend - 1; + maxstart = lastend + 1; + } + + lastend = partend; + } + + if (end - lastend > maxsize) { + maxsize = end - lastend - 1; + maxstart = lastend + 1; + } + + pp = LIST_FIRST(&geom->lg_consumer)->lg_provider; + + /* Compute beginning of new partition and maximum available space */ + if (pp->lg_stripesize > 0 && + (maxstart*pp->lg_sectorsize % pp->lg_stripesize) != 0) { + intmax_t offset = (pp->lg_stripesize - + ((maxstart*pp->lg_sectorsize) % pp->lg_stripesize)) / + pp->lg_sectorsize; + maxstart += offset; + maxsize -= offset; + } + + if (npartstart != NULL) + *npartstart = maxstart; + + return (maxsize); +} + void gpart_create(struct gprovider *pp, char *default_type, char *default_size, char *default_mountpoint, char **partname, int interactive) @@ -527,7 +626,7 @@ gpart_create(struct gprovider *pp, char struct ggeom *geom; const char *errstr, *scheme; char sizestr[32], startstr[32], output[64]; - intmax_t maxsize, size, start, end, sector, firstfree, stripe; + intmax_t maxsize, size, sector, firstfree, stripe; uint64_t bytes; int nitems, choice, junk; unsigned i; @@ -586,34 +685,12 @@ gpart_create(struct gprovider *pp, char if (geom == NULL) return; - /* Now get the maximum free size and free start */ - start = end = 0; - LIST_FOREACH(gc, &geom->lg_config, lg_config) { - if (strcmp(gc->lg_name, "first") == 0) - start = strtoimax(gc->lg_val, NULL, 0); - if (strcmp(gc->lg_name, "last") == 0) - end = strtoimax(gc->lg_val, NULL, 0); + /* Now get the partition scheme */ + LIST_FOREACH(gc, &geom->lg_config, lg_config) if (strcmp(gc->lg_name, "scheme") == 0) scheme = gc->lg_val; - } - - firstfree = start; - LIST_FOREACH(pp, &geom->lg_provider, lg_provider) { - LIST_FOREACH(gc, &pp->lg_config, lg_config) { - if (strcmp(gc->lg_name, "end") == 0) { - intmax_t partend; - partend = strtoimax(gc->lg_val, NULL, 0); - if (partend > firstfree) - firstfree = partend + 1; - } - } - } - - /* Compute beginning of new partition and maximum available space */ - if (stripe > 0 && (firstfree*sector % stripe) != 0) - firstfree += (stripe - ((firstfree*sector) % stripe)) / sector; - size = end - firstfree; + size = gpart_max_free(geom, &firstfree); if (size <= 0) { dialog_msgbox("Error", "No free space left on device.", 0, 0, TRUE); @@ -621,8 +698,8 @@ gpart_create(struct gprovider *pp, char } /* Leave a free megabyte in case we need to write a boot partition */ - if (size*sector >= 1024*1024) - size -= 1024*1024/sector; + if (size*sector >= (intmax_t)bootpart_size(scheme)) + size -= bootpart_size(scheme)/sector; maxsize = size; humanize_number(sizestr, 7, size*sector, "B", HN_AUTOSCALE, Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 16 18:04:01 2011 (r217479) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 16 18:46:17 2011 (r217480) @@ -9,11 +9,12 @@ #include "partedit.h" -#define GPART_FLAGS "x" /* Do not commit changes by default */ +#define MIN_FREE_SPACE (1024*1024*1024) /* 1 GB */ +#define SWAP_SIZE(available) MIN(available/20, 4*1024*1024*1024LL) static char *boot_disk(struct gmesh *mesh); static char *wizard_partition(struct gmesh *mesh, const char *disk); -static void wizard_makeparts(struct gmesh *mesh, const char *disk); +static int wizard_makeparts(struct gmesh *mesh, const char *disk); int part_wizard(void) { @@ -21,6 +22,7 @@ part_wizard(void) { struct gmesh mesh; char *disk, *schemeroot; +startwizard: error = geom_gettree(&mesh); dlg_put_backtitle(); @@ -40,7 +42,9 @@ part_wizard(void) { geom_deletetree(&mesh); error = geom_gettree(&mesh); - wizard_makeparts(&mesh, schemeroot); + error = wizard_makeparts(&mesh, schemeroot); + if (error) + goto startwizard; free(schemeroot); geom_deletetree(&mesh); @@ -212,7 +216,7 @@ query: return (retval); } -static void +static int wizard_makeparts(struct gmesh *mesh, const char *disk) { struct gmesh submesh; @@ -221,9 +225,9 @@ wizard_makeparts(struct gmesh *mesh, con struct gconfig *gc; const char *scheme; struct gprovider *pp; - intmax_t start, end; - intmax_t swapsize; + intmax_t swapsize, available; char swapsizestr[10], rootsizestr[10]; + int retval; LIST_FOREACH(classp, &mesh->lg_class, lg_class) if (strcmp(classp->lg_name, "PART") == 0) @@ -233,23 +237,37 @@ wizard_makeparts(struct gmesh *mesh, con if (strcmp(gp->lg_name, disk) == 0) break; - LIST_FOREACH(gc, &gp->lg_config, lg_config) { - if (strcmp(gc->lg_name, "first") == 0) - start = strtoimax(gc->lg_val, NULL, 0); - if (strcmp(gc->lg_name, "last") == 0) - end = strtoimax(gc->lg_val, NULL, 0); + LIST_FOREACH(gc, &gp->lg_config, lg_config) if (strcmp(gc->lg_name, "scheme") == 0) scheme = gc->lg_val; - } pp = provider_for_name(mesh, disk); - swapsize = MIN((end - start)*pp->lg_sectorsize/50, - 4*1024*1024*(intmax_t)(1024)); + available = gpart_max_free(gp, NULL)*pp->lg_sectorsize; + if (available < MIN_FREE_SPACE) { + char availablestr[10], neededstr[10], message[512]; + humanize_number(availablestr, 7, available, "B", HN_AUTOSCALE, + HN_DECIMAL); + humanize_number(neededstr, 7, MIN_FREE_SPACE, "B", HN_AUTOSCALE, + HN_DECIMAL); + sprintf(message, "There is not enough free space on %s to " + "install FreeBSD (%s free, %s required). Would you like " + "to choose another disk or to open the partition editor?", + disk, availablestr, neededstr); + + dialog_vars.yes_label = "Another Disk"; + dialog_vars.no_label = "Editor"; + retval = dialog_yesno("Warning", message, 0, 0); + dialog_vars.yes_label = NULL; + dialog_vars.no_label = NULL; + + return (!retval); /* Editor -> return 0 */ + } + + swapsize = SWAP_SIZE(available); humanize_number(swapsizestr, 7, swapsize, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); - humanize_number(rootsizestr, 7, - (end - start)*pp->lg_sectorsize - swapsize - 1024*1024, + humanize_number(rootsizestr, 7, available - swapsize - 1024*1024, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); geom_gettree(&submesh); @@ -261,4 +279,7 @@ wizard_makeparts(struct gmesh *mesh, con pp = provider_for_name(&submesh, disk); gpart_create(pp, "freebsd-swap", swapsizestr, NULL, NULL, 0); geom_deletetree(&submesh); + + return (0); } + Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Sun Jan 16 18:04:01 2011 (r217479) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Sun Jan 16 18:46:17 2011 (r217480) @@ -25,6 +25,7 @@ static int validate_setup(void); int main(int argc, const char **argv) { struct partition_metadata *md; + const char *prompt; struct partedit_item *items; struct gmesh mesh; int i, op, nitems, nscroll; @@ -40,8 +41,14 @@ main(int argc, const char **argv) { dialog_vars.item_help = TRUE; nscroll = i = 0; - if (strcmp(basename(argv[0]), "autopart") == 0) /* Guided */ + if (strcmp(basename(argv[0]), "autopart") == 0) { /* Guided */ + prompt = "Please review the disk setup. When complete, press " + "the Finished button."; part_wizard(); + } else { + prompt = "Create partitions for FreeBSD. No changes will be " + "made until you select Finished."; + } /* Show the part editor either immediately, or to confirm wizard */ while (1) { @@ -53,9 +60,7 @@ main(int argc, const char **argv) { if (i >= nitems) i = nitems - 1; - op = diskeditor_show("Partition Editor", - "Create partitions for FreeBSD. No changes will be made " - "until you select Finished.", + op = diskeditor_show("Partition Editor", prompt, items, nitems, &i, &nscroll); switch (op) { @@ -95,7 +100,7 @@ main(int argc, const char **argv) { if (op == 4 && validate_setup()) { /* Finished */ dialog_vars.extra_button = TRUE; dialog_vars.extra_label = - __DECONST(char *, "Don't Save"); + __DECONST(char *, "Abort"); dialog_vars.ok_label = __DECONST(char *, "Save"); op = dialog_yesno("Confirmation", "Your changes will " "now be written to disk. If you have chosen to " Modified: user/nwhitehorn/bsdinstall/partedit/partedit.h ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.h Sun Jan 16 18:04:01 2011 (r217479) +++ user/nwhitehorn/bsdinstall/partedit/partedit.h Sun Jan 16 18:46:17 2011 (r217480) @@ -1,4 +1,5 @@ #include +#include #include struct gprovider; @@ -30,6 +31,7 @@ void gpart_destroy(struct ggeom *lg_geom void gpart_edit(struct gprovider *pp); void gpart_create(struct gprovider *pp, char *default_type, char *default_size, char *default_mountpoint, char **output, int interactive); +intmax_t gpart_max_free(struct ggeom *gp, intmax_t *start); void gpart_revert(struct gprovider *pp); void gpart_revert_all(struct gmesh *mesh); void gpart_commit(struct gmesh *mesh); From owner-svn-src-user@FreeBSD.ORG Sun Jan 16 21:56:14 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 742D1106566C; Sun, 16 Jan 2011 21:56:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 638AF8FC12; Sun, 16 Jan 2011 21:56:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GLuEmL078339; Sun, 16 Jan 2011 21:56:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GLuEEP078337; Sun, 16 Jan 2011 21:56:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101162156.p0GLuEEP078337@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 16 Jan 2011 21:56:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217483 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 21:56:14 -0000 Author: nwhitehorn Date: Sun Jan 16 21:56:14 2011 New Revision: 217483 URL: http://svn.freebsd.org/changeset/base/217483 Log: Fix a possible crash when choosing to partition a totally blank disk in the partitioning wizard. Reported by: Marius Nuennerich Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 16 20:40:50 2011 (r217482) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Sun Jan 16 21:56:14 2011 (r217483) @@ -149,7 +149,7 @@ wizard_partition(struct gmesh *mesh, con struct ggeom *gpart = NULL; struct gconfig *gc; char message[512]; - const char *scheme; + const char *scheme = NULL; char *retval = NULL; int choice; @@ -188,7 +188,7 @@ query: dialog_vars.no_label = NULL; dialog_vars.defaultno = FALSE; - if (choice == 0) { /* Entire disk */ + if (scheme == NULL || choice == 0) { /* Entire disk */ if (gpart != NULL) { /* Erase partitioned disk */ choice = dialog_yesno("Confirmation", "This will erase " "the disk. Are you sure you want to proceed?", 0, 0); From owner-svn-src-user@FreeBSD.ORG Sun Jan 16 22:11:31 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05C46106564A; Sun, 16 Jan 2011 22:11:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E9BAC8FC15; Sun, 16 Jan 2011 22:11:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GMBUiS078859; Sun, 16 Jan 2011 22:11:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GMBUSH078857; Sun, 16 Jan 2011 22:11:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101162211.p0GMBUSH078857@svn.freebsd.org> From: Doug Barton Date: Sun, 16 Jan 2011 22:11:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217486 - user/dougb/portmaster/files X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 22:11:31 -0000 Author: dougb Date: Sun Jan 16 22:11:30 2011 New Revision: 217486 URL: http://svn.freebsd.org/changeset/base/217486 Log: Use 'pkg_delete -a' instead of trying to glob it Submitted by: Warren Block Modified: user/dougb/portmaster/files/portmaster.8 Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Sun Jan 16 22:10:18 2011 (r217485) +++ user/dougb/portmaster/files/portmaster.8 Sun Jan 16 22:11:30 2011 (r217486) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 1, 2011 +.Dd January 16, 2011 .Dt PORTMASTER 8 .Os .Sh NAME @@ -813,7 +813,7 @@ to do a complete reinstallation of all y .Dl "3. portmaster -ty --clean-distfiles" .Dl "4. portmaster --check-port-dbdir" .Dl "5. portmaster -Faf" -.Dl "6. pkg_delete '*'" +.Dl "6. pkg_delete -a" .Dl "7. rm -rf /usr/local/lib/compat/pkg" .Dl "8. Back up any files in /usr/local you wish to save," .Dl " such as configuration files in /usr/local/etc" From owner-svn-src-user@FreeBSD.ORG Sun Jan 16 23:49:19 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55C5F106564A; Sun, 16 Jan 2011 23:49:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 45DFC8FC0A; Sun, 16 Jan 2011 23:49:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0GNnJsl081335; Sun, 16 Jan 2011 23:49:19 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0GNnJAS081333; Sun, 16 Jan 2011 23:49:19 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201101162349.p0GNnJAS081333@svn.freebsd.org> From: Doug Barton Date: Sun, 16 Jan 2011 23:49:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217490 - user/dougb/portmaster/files X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jan 2011 23:49:19 -0000 Author: dougb Date: Sun Jan 16 23:49:19 2011 New Revision: 217490 URL: http://svn.freebsd.org/changeset/base/217490 Log: Clarify that -r builds the list of dependent ports by origin so it's safe to use -R with the new portname. Modified: user/dougb/portmaster/files/portmaster.8 Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Sun Jan 16 23:41:40 2011 (r217489) +++ user/dougb/portmaster/files/portmaster.8 Sun Jan 16 23:49:19 2011 (r217490) @@ -444,7 +444,19 @@ show what dependent ports are, and are n .It Fl o Ar replace the installed port with a port from a different origin .It [-R] Fl r Ar name/glob of port directory in /var/db/pkg -rebuild the specified port, and all ports that depend on it +rebuild the specified port, and all ports that depend on it. +The list of dependent ports is built according to origin (i.e., +.Pa category/portname ) +not by the version number of the installed port. +So if you do +.Nm +.Fl r Ar fooport-1.23 +and it is necessary to restart using +.Fl R +but the newly installed port is now fooport-1.24 you can do +.Nm +.Fl R Fl r Ar fooport-1.24 +and it should pick up where you left off. .It Fl R used with the .Fl r From owner-svn-src-user@FreeBSD.ORG Mon Jan 17 14:44:17 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20811106566B; Mon, 17 Jan 2011 14:44:17 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8F2E8FC0A; Mon, 17 Jan 2011 14:44:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0HEiGSk003250; Mon, 17 Jan 2011 14:44:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HEiGw0003247; Mon, 17 Jan 2011 14:44:16 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101171444.p0HEiGw0003247@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 17 Jan 2011 14:44:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217501 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 14:44:17 -0000 Author: nwhitehorn Date: Mon Jan 17 14:44:16 2011 New Revision: 217501 URL: http://svn.freebsd.org/changeset/base/217501 Log: Fix adding of sub-partitions to a geom that has been deleted but where the deletion has yet to be committed. Reported by: jh Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c user/nwhitehorn/bsdinstall/partedit/part_wizard.c Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Mon Jan 17 05:45:55 2011 (r217500) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Mon Jan 17 14:44:16 2011 (r217501) @@ -667,7 +667,15 @@ gpart_create(struct gprovider *pp, char if (geom == NULL && strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0) geom = pp->lg_geom; - if (geom == NULL) { + /* Now get the partition scheme */ + scheme = NULL; + if (geom != NULL) { + LIST_FOREACH(gc, &geom->lg_config, lg_config) + if (strcmp(gc->lg_name, "scheme") == 0) + scheme = gc->lg_val; + } + + if (geom == NULL || scheme == NULL || strcmp(scheme, "(none)") == 0) { if (gpart_partition(pp->lg_geom->lg_name, NULL) == 0) dialog_msgbox("", "The partition table has been successfully created." @@ -685,11 +693,6 @@ gpart_create(struct gprovider *pp, char if (geom == NULL) return; - /* Now get the partition scheme */ - LIST_FOREACH(gc, &geom->lg_config, lg_config) - if (strcmp(gc->lg_name, "scheme") == 0) - scheme = gc->lg_val; - size = gpart_max_free(geom, &firstfree); if (size <= 0) { dialog_msgbox("Error", "No free space left on device.", 0, 0, Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Mon Jan 17 05:45:55 2011 (r217500) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Mon Jan 17 14:44:16 2011 (r217501) @@ -188,7 +188,7 @@ query: dialog_vars.no_label = NULL; dialog_vars.defaultno = FALSE; - if (scheme == NULL || choice == 0) { /* Entire disk */ + if (scheme == NULL || strcmp(scheme, "(none)") == 0 || choice == 0) { if (gpart != NULL) { /* Erase partitioned disk */ choice = dialog_yesno("Confirmation", "This will erase " "the disk. Are you sure you want to proceed?", 0, 0); From owner-svn-src-user@FreeBSD.ORG Tue Jan 18 15:49:02 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DA2D106566B; Tue, 18 Jan 2011 15:49:02 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1D1438FC2C; Tue, 18 Jan 2011 15:49:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IFn2kG042746; Tue, 18 Jan 2011 15:49:02 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IFn2T8042744; Tue, 18 Jan 2011 15:49:02 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101181549.p0IFn2T8042744@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 Jan 2011 15:49:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217541 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 15:49:02 -0000 Author: nwhitehorn Date: Tue Jan 18 15:49:01 2011 New Revision: 217541 URL: http://svn.freebsd.org/changeset/base/217541 Log: Finish modifications to allow this to be used as a replacement for sade(8). Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Tue Jan 18 15:46:04 2011 (r217540) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Tue Jan 18 15:49:01 2011 (r217541) @@ -204,6 +204,7 @@ apply_changes(struct gmesh *mesh) char message[512]; int i, nitems, error; const char **items; + const char *fstab_path; FILE *fstab; nitems = 1; /* Partition table changes */ @@ -259,7 +260,11 @@ apply_changes(struct gmesh *mesh) free(__DECONST(char *, items[i*2])); free(items); - fstab = fopen(getenv("PATH_FSTAB"), "w+"); + if (getenv("PATH_FSTAB") != NULL) + fstab_path = getenv("PATH_FSTAB"); + else + fstab_path = "/etc/fstab"; + fstab = fopen(fstab_path, "w+"); if (fstab == NULL) { sprintf(message, "Cannot open fstab file %s for writing (%s)\n", getenv("PATH_FSTAB"), strerror(errno)); From owner-svn-src-user@FreeBSD.ORG Tue Jan 18 17:08:27 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 956F7106566B; Tue, 18 Jan 2011 17:08:27 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 846068FC1A; Tue, 18 Jan 2011 17:08:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IH8Rs6045014; Tue, 18 Jan 2011 17:08:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IH8Ras045012; Tue, 18 Jan 2011 17:08:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101181708.p0IH8Ras045012@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 Jan 2011 17:08:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217545 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 17:08:27 -0000 Author: nwhitehorn Date: Tue Jan 18 17:08:27 2011 New Revision: 217545 URL: http://svn.freebsd.org/changeset/base/217545 Log: Avoid some warning messages in partedit after reverting partitioning. Modified: user/nwhitehorn/bsdinstall/scripts/auto Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 16:49:51 2011 (r217544) +++ user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:08:27 2011 (r217545) @@ -38,6 +38,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then fi rm $PATH_FSTAB +touch $PATH_FSTAB dialog --backtitle "FreeBSD Installer" --title "Partitioning" --extra-button \ --extra-label "Manual" --ok-label "Guided" --cancel-label "Shell" \ From owner-svn-src-user@FreeBSD.ORG Tue Jan 18 17:48:22 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23074106564A; Tue, 18 Jan 2011 17:48:22 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 122428FC13; Tue, 18 Jan 2011 17:48:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IHmL9x046037; Tue, 18 Jan 2011 17:48:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IHmLVE046034; Tue, 18 Jan 2011 17:48:21 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101181748.p0IHmLVE046034@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 Jan 2011 17:48:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217547 - in user/nwhitehorn/bsdinstall: release scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 17:48:22 -0000 Author: nwhitehorn Date: Tue Jan 18 17:48:21 2011 New Revision: 217547 URL: http://svn.freebsd.org/changeset/base/217547 Log: Warn user of impending reboot and move location of reboot dialog from auto to the rc.local wrapper script. Modified: user/nwhitehorn/bsdinstall/release/rc.local user/nwhitehorn/bsdinstall/scripts/auto Modified: user/nwhitehorn/bsdinstall/release/rc.local ============================================================================== --- user/nwhitehorn/bsdinstall/release/rc.local Tue Jan 18 17:35:34 2011 (r217546) +++ user/nwhitehorn/bsdinstall/release/rc.local Tue Jan 18 17:48:21 2011 (r217547) @@ -16,6 +16,7 @@ $DIALOG_OK) # Install BSDINSTALL_CONFIGCURRENT=yes; export BSDINSTALL_CONFIGCURRENT trap true SIGINT # Ignore cntrl-C here bsdinstall + dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete! The system will now reboot." 0 0 reboot ;; $DIALOG_CANCEL) # Live CD Modified: user/nwhitehorn/bsdinstall/scripts/auto ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:35:34 2011 (r217546) +++ user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:48:21 2011 (r217547) @@ -84,7 +84,5 @@ bsdinstall adduser trap error SIGINT # SIGINT is bad again bsdinstall config || error -dialog --backtitle "FreeBSD Installer" --title "Complete" --msgbox "Installation of FreeBSD complete!" 0 0 - echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG From owner-svn-src-user@FreeBSD.ORG Tue Jan 18 17:55:25 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05A1A1065675; Tue, 18 Jan 2011 17:55:25 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E90628FC0A; Tue, 18 Jan 2011 17:55:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IHtOsT046315; Tue, 18 Jan 2011 17:55:24 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IHtOi4046313; Tue, 18 Jan 2011 17:55:24 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101181755.p0IHtOi4046313@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 Jan 2011 17:55:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217549 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 17:55:25 -0000 Author: nwhitehorn Date: Tue Jan 18 17:55:24 2011 New Revision: 217549 URL: http://svn.freebsd.org/changeset/base/217549 Log: Consistently show the "FreeBSD Installer" backtitle. Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c Modified: user/nwhitehorn/bsdinstall/partedit/part_wizard.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/part_wizard.c Tue Jan 18 17:50:14 2011 (r217548) +++ user/nwhitehorn/bsdinstall/partedit/part_wizard.c Tue Jan 18 17:55:24 2011 (r217549) @@ -37,9 +37,10 @@ startwizard: free(disk); if (schemeroot == NULL) return (1); - dlg_clear(); geom_deletetree(&mesh); + dlg_clear(); + dlg_put_backtitle(); error = geom_gettree(&mesh); error = wizard_makeparts(&mesh, schemeroot); From owner-svn-src-user@FreeBSD.ORG Tue Jan 18 19:36:04 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEA88106566B; Tue, 18 Jan 2011 19:36:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE67E8FC0C; Tue, 18 Jan 2011 19:36:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IJa4Fj049389; Tue, 18 Jan 2011 19:36:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IJa42s049387; Tue, 18 Jan 2011 19:36:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101181936.p0IJa42s049387@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 18 Jan 2011 19:36:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217552 - user/ae/usr.sbin/sade X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 19:36:04 -0000 Author: nwhitehorn Date: Tue Jan 18 19:36:04 2011 New Revision: 217552 URL: http://svn.freebsd.org/changeset/base/217552 Log: Fix build after libdialog update. Modified: user/ae/usr.sbin/sade/Makefile Modified: user/ae/usr.sbin/sade/Makefile ============================================================================== --- user/ae/usr.sbin/sade/Makefile Tue Jan 18 19:31:38 2011 (r217551) +++ user/ae/usr.sbin/sade/Makefile Tue Jan 18 19:36:04 2011 (r217552) @@ -14,11 +14,11 @@ SRCS+= ${LIBSADE} WARNS?= 1 -DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBDIALOG} ${LIBNCURSES} ${LIBUFS} -LDADD= -lutil -lgeom -ldialog -lncurses -lufs +DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBODIALOG} ${LIBNCURSES} ${LIBUFS} +LDADD= -lutil -lgeom -lodialog -lncurses -lufs DEBUG_FLAGS?= -g -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${SRCPATH}/gnu/lib/libdialog \ +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${SRCPATH}/gnu/lib/libodialog \ -I${.CURDIR}/${SRCPATH}/sbin/mount .include From owner-svn-src-user@FreeBSD.ORG Wed Jan 19 03:10:25 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5822E10656C9; Wed, 19 Jan 2011 03:10:25 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 478348FC17; Wed, 19 Jan 2011 03:10:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0J3APcq060934; Wed, 19 Jan 2011 03:10:25 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0J3APQi060929; Wed, 19 Jan 2011 03:10:25 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101190310.p0J3APQi060929@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 19 Jan 2011 03:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217568 - in user/nwhitehorn/bsdinstall: . scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2011 03:10:25 -0000 Author: nwhitehorn Date: Wed Jan 19 03:10:24 2011 New Revision: 217568 URL: http://svn.freebsd.org/changeset/base/217568 Log: Add a script to install jails. Added: user/nwhitehorn/bsdinstall/scripts/jail - copied, changed from r217547, user/nwhitehorn/bsdinstall/scripts/auto Modified: user/nwhitehorn/bsdinstall/bsdinstall user/nwhitehorn/bsdinstall/scripts/Makefile Modified: user/nwhitehorn/bsdinstall/bsdinstall ============================================================================== --- user/nwhitehorn/bsdinstall/bsdinstall Wed Jan 19 01:26:49 2011 (r217567) +++ user/nwhitehorn/bsdinstall/bsdinstall Wed Jan 19 03:10:24 2011 (r217568) @@ -1,11 +1,11 @@ #!/bin/sh -DISTRIBUTIONS="kernel.tgz world.tgz distribution.tgz"; export DISTRIBUTIONS -BSDINSTALL_LOG="/tmp/bsdinstall_log"; export BSDINSTALL_LOG -BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"; export BSDINSTALL_TMPETC -PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"; export PATH_FSTAB -BSDINSTALL_DISTDIR="/usr/bsdinstall-dist"; export BSDINSTALL_DISTDIR -BSDINSTALL_CHROOT="/mnt"; export BSDINSTALL_CHROOT +[ -z "$DISTRIBUTIONS" ] && export DISTRIBUTIONS="kernel.tgz world.tgz distribution.tgz" +[ -z "$BSDINSTALL_LOG" ] && export BSDINSTALL_LOG="/tmp/bsdinstall_log" +[ -z "$BSDINSTALL_TMPETC" ] && export BSDINSTALL_TMPETC="/tmp/bsdinstall_etc" +[ -z "$PATH_FSTAB" ] && export PATH_FSTAB="$BSDINSTALL_TMPETC/fstab" +[ -z "$BSDINSTALL_DISTDIR" ] && export BSDINSTALL_DISTDIR="/usr/bsdinstall-dist" +[ -z "$BSDINSTALL_CHROOT" ] && export BSDINSTALL_CHROOT="/mnt" VERB=$1; shift Modified: user/nwhitehorn/bsdinstall/scripts/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/Makefile Wed Jan 19 01:26:49 2011 (r217567) +++ user/nwhitehorn/bsdinstall/scripts/Makefile Wed Jan 19 03:10:24 2011 (r217568) @@ -1,7 +1,7 @@ # $FreeBSD $ -SCRIPTS= auto adduser config hostname keymap mount netconfig rootpass services \ - time umount +SCRIPTS= auto adduser config hostname jail keymap mount netconfig rootpass \ + services time umount BINDIR= /usr/libexec/bsdinstall NO_MAN= true Copied and modified: user/nwhitehorn/bsdinstall/scripts/jail (from r217547, user/nwhitehorn/bsdinstall/scripts/auto) ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/auto Tue Jan 18 17:48:21 2011 (r217547, copy source) +++ user/nwhitehorn/bsdinstall/scripts/jail Wed Jan 19 03:10:24 2011 (r217568) @@ -2,6 +2,9 @@ echo "Begun Installation at $(date)" > $BSDINSTALL_LOG +export BSDINSTALL_CHROOT=$1 +export DISTRIBUTIONS="`echo $DISTRIBUTIONS | sed 's/kernel\.[^ ]* //g'`" + error() { dialog --backtitle "FreeBSD Installer" --title "Abort" \ --no-label "Exit" --yes-label "Restart" --yesno \ @@ -18,11 +21,7 @@ error() { rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC -trap true SIGINT # This section is optional -bsdinstall keymap - -trap error SIGINT # Catch cntrl-C here -bsdinstall hostname || error +trap error SIGINT # SIGINT is bad FETCH_DISTRIBUTIONS="" for dist in $DISTRIBUTIONS; do @@ -31,38 +30,6 @@ for dist in $DISTRIBUTIONS; do fi done -if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then - dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 - bsdinstall netconfig || error - NETCONFIG_DONE=yes -fi - -rm $PATH_FSTAB -touch $PATH_FSTAB - -dialog --backtitle "FreeBSD Installer" --title "Partitioning" --extra-button \ - --extra-label "Manual" --ok-label "Guided" --cancel-label "Shell" \ - --yesno "Would you like to use the guided partitioning tool (recommended for beginners) or to set up partitions manually (experts)? You can also open a shell and set up partitions entirely by hand." 0 0 - -case $? in -0) # Guided - bsdinstall autopart || error - bsdinstall mount || error - ;; -1) # Shell - clear - echo "Use this shell to set up partitions for the new system. When finished, mount the system at $BSDINSTALL_CHROOT and place an fstab file for the new system at $PATH_FSTAB. Then type 'exit'. You can also enter the partition editor at any time by entering 'bsdinstall partedit'." - sh - ;; -3) # Manual - bsdinstall partedit || error - bsdinstall mount || error - ;; -*) - error - ;; -esac - if [ ! -z $FETCH_DISTRIBUTIONS ]; then ALL_DISTRIBUTIONS=$DISTRIBUTIONS DISTRIBUTIONS=$FETCH_DISTRIBUTIONS @@ -74,9 +41,6 @@ bsdinstall distextract || error bsdinstall rootpass || error trap true SIGINT # This section is optional -if [ "$NETCONFIG_DONE" != yes ]; then - bsdinstall netconfig # Don't check for errors -- the user may cancel -fi bsdinstall time bsdinstall services bsdinstall adduser From owner-svn-src-user@FreeBSD.ORG Wed Jan 19 04:28:51 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A53851065670; Wed, 19 Jan 2011 04:28:51 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B85F8FC1C; Wed, 19 Jan 2011 04:28:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0J4SpiC063138; Wed, 19 Jan 2011 04:28:51 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0J4Spr6063137; Wed, 19 Jan 2011 04:28:51 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201101190428.p0J4Spr6063137@svn.freebsd.org> From: Warner Losh Date: Wed, 19 Jan 2011 04:28:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217570 - user/imp/tbemd X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2011 04:28:51 -0000 Author: imp Date: Wed Jan 19 04:28:51 2011 New Revision: 217570 URL: http://svn.freebsd.org/changeset/base/217570 Log: "Goodbye, my friend, it's hard to die When all the birds are singing in the sky Now that the spring is in the air Pretty girls are everywhere, think of me and I'll be there" Retire my copy of tbemd: Target Big Endian is Dead and all the code is in head, and even more. Deleted: user/imp/tbemd/ From owner-svn-src-user@FreeBSD.ORG Fri Jan 21 12:37:22 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5324E1065673; Fri, 21 Jan 2011 12:37:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 288D68FC1E; Fri, 21 Jan 2011 12:37:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0LCbMsg052452; Fri, 21 Jan 2011 12:37:22 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0LCbMff052451; Fri, 21 Jan 2011 12:37:22 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201101211237.p0LCbMff052451@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 21 Jan 2011 12:37:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217690 - user/des/svnsup/include/svnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2011 12:37:22 -0000 Author: des Date: Fri Jan 21 12:37:21 2011 New Revision: 217690 URL: http://svn.freebsd.org/changeset/base/217690 Log: Forgot to commit this way back when. Added: user/des/svnsup/include/svnsup/error.h (contents, props changed) Added: user/des/svnsup/include/svnsup/error.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/include/svnsup/error.h Fri Jan 21 12:37:21 2011 (r217690) @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#ifndef SVNSUP_ERROR_H_INCLUDED +#define SVNSUP_ERROR_H_INCLUDED + +typedef enum svnsup_err { + SVNSUP_ERR_NONE, + SVNSUP_ERR_MEMORY, + SVNSUP_ERR_UNKNOWN, + SVNSUP_ERR_MAX, +} svnsup_err_t; + +#endif From owner-svn-src-user@FreeBSD.ORG Fri Jan 21 12:39:28 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB4C4106564A; Fri, 21 Jan 2011 12:39:28 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DB6588FC1C; Fri, 21 Jan 2011 12:39:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0LCdSss052527; Fri, 21 Jan 2011 12:39:28 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0LCdS38052525; Fri, 21 Jan 2011 12:39:28 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201101211239.p0LCdS38052525@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 21 Jan 2011 12:39:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217691 - user/des/svnsup/lib/libsvnsup X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2011 12:39:29 -0000 Author: des Date: Fri Jan 21 12:39:28 2011 New Revision: 217691 URL: http://svn.freebsd.org/changeset/base/217691 Log: Check return value from vasprintf(3). Modified: user/des/svnsup/lib/libsvnsup/svnsup_delta.c Modified: user/des/svnsup/lib/libsvnsup/svnsup_delta.c ============================================================================== --- user/des/svnsup/lib/libsvnsup/svnsup_delta.c Fri Jan 21 12:37:21 2011 (r217690) +++ user/des/svnsup/lib/libsvnsup/svnsup_delta.c Fri Jan 21 12:39:28 2011 (r217691) @@ -163,13 +163,16 @@ svnsup_delta_meta(svnsup_delta_t sd, con { va_list ap; char *value; + int ret; assert(sd != NULL); assert(key != NULL); assert(fmt != NULL); va_start(ap, fmt); - vasprintf(&value, fmt, ap); + ret = vasprintf(&value, fmt, ap); va_end(ap); + if (ret == -1) + return (SVNSUP_ERR_MEMORY); fprintf(sd->f, "@meta "); svnsup_string_fencode(sd->f, key); fprintf(sd->f, " "); From owner-svn-src-user@FreeBSD.ORG Fri Jan 21 13:45:09 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C2DC1065672; Fri, 21 Jan 2011 13:45:09 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4BA448FC13; Fri, 21 Jan 2011 13:45:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0LDj9V2054073; Fri, 21 Jan 2011 13:45:09 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0LDj9Ir054069; Fri, 21 Jan 2011 13:45:09 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201101211345.p0LDj9Ir054069@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 21 Jan 2011 13:45:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217692 - user/des/svnsup/bin/distill X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2011 13:45:09 -0000 Author: des Date: Fri Jan 21 13:45:09 2011 New Revision: 217692 URL: http://svn.freebsd.org/changeset/base/217692 Log: Add support for including additional meta-information in the delta. Modified: user/des/svnsup/bin/distill/distill.c user/des/svnsup/bin/distill/distill.h user/des/svnsup/bin/distill/log.c Modified: user/des/svnsup/bin/distill/distill.c ============================================================================== --- user/des/svnsup/bin/distill/distill.c Fri Jan 21 12:39:28 2011 (r217691) +++ user/des/svnsup/bin/distill/distill.c Fri Jan 21 13:45:09 2011 (r217692) @@ -38,8 +38,9 @@ #include "distill.h" -int debug; -int verbose; +int debug; /* print debugging information */ +int extended; /* generated extended delta */ +int verbose; /* show messages from libsvn */ static int distill(const char *url, unsigned long revision) @@ -104,7 +105,7 @@ distill(const char *url, unsigned long r /* get revision metadata */ error = svn_ra_get_log2(ra_session, NULL, revision, revision, 0, - TRUE, TRUE, FALSE, NULL, log_entry_receiver, NULL, pool); + TRUE, TRUE, FALSE, NULL, log_entry_receiver, sd, pool); SVNSUP_SVN_ERROR(error, "svn_ra_get_log()"); /* replay the requested revision */ @@ -125,7 +126,7 @@ static void usage(void) { - fprintf(stderr, "usage: svnsup-distill [-v] url rev\n"); + fprintf(stderr, "usage: svnsup-distill [-dev] url rev\n"); exit(1); } @@ -138,11 +139,14 @@ main(int argc, char *argv[]) unsigned long rev; int opt, ret; - while ((opt = getopt(argc, argv, "dv")) != -1) + while ((opt = getopt(argc, argv, "dev")) != -1) switch (opt) { case 'd': ++debug; break; + case 'e': + ++extended; + break; case 'v': ++verbose; break; Modified: user/des/svnsup/bin/distill/distill.h ============================================================================== --- user/des/svnsup/bin/distill/distill.h Fri Jan 21 12:39:28 2011 (r217691) +++ user/des/svnsup/bin/distill/distill.h Fri Jan 21 13:45:09 2011 (r217692) @@ -46,6 +46,7 @@ #include "svnsup/svnsup.h" extern int debug; +extern int extended; extern int verbose; typedef struct svnsup_where { Modified: user/des/svnsup/bin/distill/log.c ============================================================================== --- user/des/svnsup/bin/distill/log.c Fri Jan 21 12:39:28 2011 (r217691) +++ user/des/svnsup/bin/distill/log.c Fri Jan 21 13:45:09 2011 (r217692) @@ -40,40 +40,24 @@ log_entry_receiver(void *baton, svn_log_entry_t *log_entry, apr_pool_t *pool) { -#if 0 - apr_hash_index_t *hash_index; - const void *key; - void *value; - apr_ssize_t keylen; -#else + static const char *revprops[] = { "svn:author", "svn:date", "svn:log", NULL }; + svnsup_delta_t sd = (svnsup_delta_t)baton; svn_string_t *value; -#endif + const char **p; + int ret; (void)pool; - (void)baton; SVNSUP_DEBUG("%s(r%lu)\n", __func__, (long)log_entry->revision); - if (!debug) + if (!extended) return (SVN_NO_ERROR); - fprintf(stderr, "revision properties:\n"); -#if 0 - for (hash_index = apr_hash_first(pool, log_entry->revprops); - hash_index != NULL; hash_index = apr_hash_next(hash_index)) { - apr_hash_this(hash_index, &key, &keylen, &value); - fprintf(stderr, " %s: %s\n", (const char *)key, - ((svn_string_t *)value)->data); - } -#else - do { - const char *props[] = { "svn:author", "svn:date", NULL }; - const char **p; - for (p = props; *p != NULL; ++p) { - value = apr_hash_get(log_entry->revprops, *p, APR_HASH_KEY_STRING); - SVNSUP_ASSERT(value != NULL, "revision has no %s property", *p); - fprintf(stderr, " %s: %s\n", *p, value->data); + for (p = revprops; *p != NULL; ++p) { + value = apr_hash_get(log_entry->revprops, *p, APR_HASH_KEY_STRING); + if (value != NULL) { + ret = svnsup_delta_meta(sd, *p, "%s", value->data); + SVNSUP_SVNSUP_ERROR(ret, "svnsup_delta_meta()"); } - } while (0); -#endif + } return (SVN_NO_ERROR); } From owner-svn-src-user@FreeBSD.ORG Fri Jan 21 13:46:35 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F6981065673; Fri, 21 Jan 2011 13:46:35 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0EC1B8FC13; Fri, 21 Jan 2011 13:46:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0LDkYuH054148; Fri, 21 Jan 2011 13:46:34 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0LDkY8N054144; Fri, 21 Jan 2011 13:46:34 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201101211346.p0LDkY8N054144@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Fri, 21 Jan 2011 13:46:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217693 - user/des/svnsup/bin/apply X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Jan 2011 13:46:35 -0000 Author: des Date: Fri Jan 21 13:46:34 2011 New Revision: 217693 URL: http://svn.freebsd.org/changeset/base/217693 Log: Extended stub Added: user/des/svnsup/bin/apply/apply.c (contents, props changed) user/des/svnsup/bin/apply/apply.h (contents, props changed) Deleted: user/des/svnsup/bin/apply/main.c Modified: user/des/svnsup/bin/apply/Makefile.am Modified: user/des/svnsup/bin/apply/Makefile.am ============================================================================== --- user/des/svnsup/bin/apply/Makefile.am Fri Jan 21 13:45:09 2011 (r217692) +++ user/des/svnsup/bin/apply/Makefile.am Fri Jan 21 13:46:34 2011 (r217693) @@ -3,7 +3,7 @@ bin_PROGRAMS = svnsup-apply svnsup_apply_SOURCES = \ - main.c + apply.c svnsup_apply_CPPFLAGS = \ -I$(top_srcdir)/include Added: user/des/svnsup/bin/apply/apply.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/bin/apply/apply.c Fri Jan 21 13:46:34 2011 (r217693) @@ -0,0 +1,75 @@ +/*- + * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include + +#include "apply.h" + +int debug; /* print debugging information */ +int verbose; /* show meta-information from delta */ + +static void +usage(void) +{ + + fprintf(stderr, "usage: svnsup-apply [-dv]\n"); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + int opt; + + while ((opt = getopt(argc, argv, "dv")) != -1) + switch (opt) { + case 'd': + ++debug; + break; + case 'v': + ++verbose; + break; + default: + usage(); + } + + argc -= optind; + argv += optind; + + if (argc != 0) + usage(); + + return (0); +} Added: user/des/svnsup/bin/apply/apply.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/des/svnsup/bin/apply/apply.h Fri Jan 21 13:46:34 2011 (r217693) @@ -0,0 +1,38 @@ +/*- + * Copyright (c) 2009 Dag-Erling Coïdan Smørgrav + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $Id$ + */ + +#ifndef APPLY_H_INCLUDED +#define APPLY_H_INCLUDED + +#include "svnsup/svnsup.h" + +extern int debug; +extern int verbose; + +#endif