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

With the recent libdisk changes, alpha doesn't need (as much) special magic.

Browse Source
This commit is contained in:
phk 2002-10-30 20:55:25 +00:00
parent c925cf4a99
commit c95a6c4e9d
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr.sbin/sade/label.c
View File

@ -679,30 +679,6 @@ clear_wins(void)
print_label_chunks();
}
#if defined(__alpha__)
/*
* If there isn't a freebsd chunk already (i.e. there is no label),
* dedicate the disk.
*/
static void
maybe_dedicate(Disk* d)
{
struct chunk *c;
for (c = d->chunks->part; c; c = c->next) {
if (c->type == freebsd)
break;
}
if (!c) {
msgDebug("dedicating disk");
All_FreeBSD(d, 1);
}
}
#endif
static int
diskLabel(Device *dev)
{
@ -712,9 +688,6 @@ diskLabel(Device *dev)
PartInfo *p, *oldp;
PartType type;
Device **devs;
#if defined(__alpha__)
int i;
#endif
WINDOW *w = savescr();
label_focus = 0;
@ -729,11 +702,6 @@ diskLabel(Device *dev)
}
labeling = TRUE;
keypad(stdscr, TRUE);
#if defined(__alpha__)
for (i = 0; devs[i]; i++) {
maybe_dedicate((Disk*) devs[i]->private);
}
#endif
record_label_chunks(devs, dev);
clear();
@ -1381,9 +1349,6 @@ diskLabelNonInteractive(Device *dev)
d = dev->private;
else
d = devs[0]->private;
#if defined(__alpha__)
maybe_dedicate(d);
#endif
record_label_chunks(devs, dev);
for (i = 0; label_chunk_info[i].c; i++) {
Chunk *c1 = label_chunk_info[i].c;

35
usr.sbin/sysinstall/label.c
View File

@ -679,30 +679,6 @@ clear_wins(void)
print_label_chunks();
}
#if defined(__alpha__)
/*
* If there isn't a freebsd chunk already (i.e. there is no label),
* dedicate the disk.
*/
static void
maybe_dedicate(Disk* d)
{
struct chunk *c;
for (c = d->chunks->part; c; c = c->next) {
if (c->type == freebsd)
break;
}
if (!c) {
msgDebug("dedicating disk");
All_FreeBSD(d, 1);
}
}
#endif
static int
diskLabel(Device *dev)
{
@ -712,9 +688,6 @@ diskLabel(Device *dev)
PartInfo *p, *oldp;
PartType type;
Device **devs;
#if defined(__alpha__)
int i;
#endif
WINDOW *w = savescr();
label_focus = 0;
@ -729,11 +702,6 @@ diskLabel(Device *dev)
}
labeling = TRUE;
keypad(stdscr, TRUE);
#if defined(__alpha__)
for (i = 0; devs[i]; i++) {
maybe_dedicate((Disk*) devs[i]->private);
}
#endif
record_label_chunks(devs, dev);
clear();
@ -1381,9 +1349,6 @@ diskLabelNonInteractive(Device *dev)
d = dev->private;
else
d = devs[0]->private;
#if defined(__alpha__)
maybe_dedicate(d);
#endif
record_label_chunks(devs, dev);
for (i = 0; label_chunk_info[i].c; i++) {
Chunk *c1 = label_chunk_info[i].c;