version 1.32, 2000/09/27 12:42:04 |
version 1.33, 2000/10/11 23:47:55 |
Line 232 int write_disklabel (void) |
|
Line 232 int write_disklabel (void) |
|
|
|
#ifdef DISKLABEL_CMD |
#ifdef DISKLABEL_CMD |
/* disklabel the disk */ |
/* disklabel the disk */ |
return run_prog(0, 1, MSG_cmdfail, |
return run_prog(RUN_DISPLAY, MSG_cmdfail, |
"%s %s %s", DISKLABEL_CMD, diskdev, bsddiskname); |
"%s %s %s", DISKLABEL_CMD, diskdev, bsddiskname); |
#endif |
#endif |
return 0; |
return 0; |
Line 271 do_ffs_newfs(const char *partname, int p |
|
Line 271 do_ffs_newfs(const char *partname, int p |
|
char devname[STRSIZE]; |
char devname[STRSIZE]; |
int error; |
int error; |
|
|
error = run_prog(0, 1, MSG_cmdfail, |
error = run_prog(RUN_DISPLAY, MSG_cmdfail, |
"/sbin/newfs /dev/r%s", partname); |
"/sbin/newfs /dev/r%s", partname); |
if (*mountpoint && error == 0) { |
if (*mountpoint && error == 0) { |
snprintf(devname, STRSIZE, "/dev/%s", partname); |
snprintf(devname, STRSIZE, "/dev/%s", partname); |
Line 441 do_fsck(const char *diskpart) |
|
Line 441 do_fsck(const char *diskpart) |
|
|
|
/*endwin();*/ |
/*endwin();*/ |
#ifndef DEBUG_SETS |
#ifndef DEBUG_SETS |
err = run_prog(0, 1, NULL, "/sbin/fsck_ffs %s%s", upgr, raw); |
err = run_prog(RUN_DISPLAY, NULL, "/sbin/fsck_ffs %s%s", upgr, raw); |
#else |
#else |
err = run_prog(0, 1, NULL, "/sbin/fsck_ffs -f %s%s", upgr, raw); |
err = run_prog(RUN_DISPLAY, NULL, "/sbin/fsck_ffs -f %s%s", upgr, raw); |
#endif |
#endif |
wrefresh(stdscr); |
wrefresh(stdscr); |
return err; |
return err; |
Line 609 set_swap(dev, pp, enable) |
|
Line 609 set_swap(dev, pp, enable) |
|
|
|
for (i = 0; i < maxpart; i++) { |
for (i = 0; i < maxpart; i++) { |
if (pp[i].pi_fstype == FS_SWAP) { |
if (pp[i].pi_fstype == FS_SWAP) { |
if (run_prog(0, 0, NULL, |
if (run_prog(0, NULL, |
"/sbin/swapctl -%c /dev/%s%c", |
"/sbin/swapctl -%c /dev/%s%c", |
enable ? 'a' : 'd', dev, 'a' + i) != 0) |
enable ? 'a' : 'd', dev, 'a' + i) != 0) |
return -1; |
return -1; |