Deleted Added
full compact
disks.c (54587) disks.c (54722)
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
7 * $FreeBSD: head/usr.sbin/sysinstall/disks.c 54587 1999-12-14 04:25:29Z jkh $
7 * $FreeBSD: head/usr.sbin/sysinstall/disks.c 54722 1999-12-17 02:46:04Z jkh $
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

--- 657 unchanged lines hidden (view full) ---

673 }
674
675 /* If we've been through here before, we don't need to do the rest */
676 if (cp && !strcmp(cp, "written"))
677 return DITEM_SUCCESS;
678 }
679 /* Now it's not "yes", but "written" */
680 variable_set2(DISK_PARTITIONED, "written", 0);
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

--- 657 unchanged lines hidden (view full) ---

673 }
674
675 /* If we've been through here before, we don't need to do the rest */
676 if (cp && !strcmp(cp, "written"))
677 return DITEM_SUCCESS;
678 }
679 /* Now it's not "yes", but "written" */
680 variable_set2(DISK_PARTITIONED, "written", 0);
681 return DITEM_SUCCESS;
681 return DITEM_SUCCESS | DITEM_RESTORE;
682}
683
684/* Partition a disk based wholly on which variables are set */
685static void
686diskPartitionNonInteractive(Device *dev)
687{
688 char *cp;
689 int i, sz, all_disk = 0;

--- 81 unchanged lines hidden ---
682}
683
684/* Partition a disk based wholly on which variables are set */
685static void
686diskPartitionNonInteractive(Device *dev)
687{
688 char *cp;
689 int i, sz, all_disk = 0;

--- 81 unchanged lines hidden ---