d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only automatically create an 'a' partition when there is nothing

Browse Source 
but a 'c' partition.
This commit is contained in:
Poul-Henning Kamp 2003-10-18 19:32:35 +00:00
parent cbef13d877
commit 427823d576
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=121222
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sbin/bsdlabel/bsdlabel.c
View File

@ -84,6 +84,7 @@ static int readlabel(int flag);
static void display(FILE *, const struct disklabel *); static void display(FILE *, const struct disklabel *);
static int edit(void); static int edit(void);
static int editit(void); static int editit(void);
static void fixlabel(struct disklabel *);
static char *skip(char *); static char *skip(char *);
static char *word(char *); static char *word(char *);
static int getasciilabel(FILE *, struct disklabel *); static int getasciilabel(FILE *, struct disklabel *);
@ -235,6 +236,7 @@ main(int argc, char *argv[])
if (argc != 1) if (argc != 1)
usage(); usage();
readlabel(1); readlabel(1);
fixlabel(&lab);
error = edit(); error = edit();
break; break;
@ -266,6 +268,7 @@ main(int argc, char *argv[])
usage(); usage();
readlabel(0); readlabel(0);
makelabel(name, &lab); makelabel(name, &lab);
fixlabel(&lab);
if (checklabel(NULL) == 0) if (checklabel(NULL) == 0)
error = writelabel(); error = writelabel();
break; break;
@ -273,6 +276,7 @@ main(int argc, char *argv[])
case WRITEBOOT: case WRITEBOOT:
readlabel(1); readlabel(1);
fixlabel(&lab);
if (argc == 2) if (argc == 2)
makelabel(argv[1], &lab); makelabel(argv[1], &lab);
if (checklabel(NULL) == 0) if (checklabel(NULL) == 0)
@ -282,6 +286,24 @@ main(int argc, char *argv[])
exit(error); exit(error);
} }
static void
fixlabel(struct disklabel *lp)
{
struct partition *dp;
int i;
for (i = 0; i < MAXPARTITIONS; i++) {
if (i == RAW_PART)
continue;
if (lp->d_partitions[i].p_size)
return;
}
dp = &lp->d_partitions[0];
dp->p_offset = BBSIZE / secsize;
dp->p_size = lp->d_secperunit - dp->p_offset;
}
/* /*
* Construct a prototype disklabel from /etc/disktab. * Construct a prototype disklabel from /etc/disktab.
*/ */
@ -1338,10 +1360,6 @@ getvirginlabel(void)
strncpy(loclab.d_typename, "amnesiac", strncpy(loclab.d_typename, "amnesiac",
sizeof(loclab.d_typename)); sizeof(loclab.d_typename));
dp = &loclab.d_partitions[0];
dp->p_offset = BBSIZE / secsize;
dp->p_size = loclab.d_secperunit - dp->p_offset;
dp = &loclab.d_partitions[RAW_PART]; dp = &loclab.d_partitions[RAW_PART];
dp->p_size = loclab.d_secperunit; dp->p_size = loclab.d_secperunit;
loclab.d_checksum = dkcksum(&loclab); loclab.d_checksum = dkcksum(&loclab);