label.c (17397) | label.c (17404) |
---|---|
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 * $Id: label.c,v 1.56 1996/08/01 11:39:49 jkh Exp $ | 7 * $Id: label.c,v 1.57 1996/08/03 05:25:56 jkh Exp $ |
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 --- 300 unchanged lines hidden (view full) --- 316 WINDOW *save = savescr(); 317 318 static unsigned char *fs_types[] = { 319 "FS", 320 "A file system", 321 "Swap", 322 "A swap partition.", 323 }; | 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 --- 300 unchanged lines hidden (view full) --- 316 WINDOW *save = savescr(); 317 318 static unsigned char *fs_types[] = { 319 "FS", 320 "A file system", 321 "Swap", 322 "A swap partition.", 323 }; |
324 dialog_clear(); | 324 dialog_clear_norefresh(); |
325 i = dialog_menu("Please choose a partition type", 326 "If you want to use this partition for swap space, select Swap.\n" 327 "If you want to put a filesystem on it, choose FS.", 328 -1, -1, 2, 2, fs_types, selection, NULL, NULL); 329 restorescr(save); 330 if (!i) { 331 if (!strcmp(selection, "FS")) 332 return PART_FILESYSTEM; --- 142 unchanged lines hidden (view full) --- 475 msgConfirm("No disks found!"); 476 return DITEM_FAILURE; 477 } 478 479 labeling = TRUE; 480 keypad(stdscr, TRUE); 481 record_label_chunks(devs); 482 | 325 i = dialog_menu("Please choose a partition type", 326 "If you want to use this partition for swap space, select Swap.\n" 327 "If you want to put a filesystem on it, choose FS.", 328 -1, -1, 2, 2, fs_types, selection, NULL, NULL); 329 restorescr(save); 330 if (!i) { 331 if (!strcmp(selection, "FS")) 332 return PART_FILESYSTEM; --- 142 unchanged lines hidden (view full) --- 475 msgConfirm("No disks found!"); 476 return DITEM_FAILURE; 477 } 478 479 labeling = TRUE; 480 keypad(stdscr, TRUE); 481 record_label_chunks(devs); 482 |
483 dialog_clear(); clear(); | 483 dialog_clear_norefresh(); clear(); |
484 while (labeling) { 485 print_label_chunks(); 486 if (first_time) { 487 print_command_summary(); 488 first_time = 0; 489 } 490 if (msg) { 491 attrset(title_attr); mvprintw(23, 0, msg); attrset(A_NORMAL); --- 354 unchanged lines hidden (view full) --- 846 break; 847 } 848 for (i = 0; devs[i] && ((Disk *)devs[i]->private); i++) { 849 if (devs[i]->enabled) 850 slice_wizard(((Disk *)devs[i]->private)); 851 } 852 variable_set2(DISK_LABELLED, "yes"); 853 DialogActive = TRUE; | 484 while (labeling) { 485 print_label_chunks(); 486 if (first_time) { 487 print_command_summary(); 488 first_time = 0; 489 } 490 if (msg) { 491 attrset(title_attr); mvprintw(23, 0, msg); attrset(A_NORMAL); --- 354 unchanged lines hidden (view full) --- 846 break; 847 } 848 for (i = 0; devs[i] && ((Disk *)devs[i]->private); i++) { 849 if (devs[i]->enabled) 850 slice_wizard(((Disk *)devs[i]->private)); 851 } 852 variable_set2(DISK_LABELLED, "yes"); 853 DialogActive = TRUE; |
854 dialog_clear(); | 854 dialog_clear_norefresh(); |
855 restorescr(save); 856 record_label_chunks(devs); 857 } 858 else 859 msg = "A most prudent choice!"; 860 break; 861 862 case 'Q': --- 12 unchanged lines hidden --- | 855 restorescr(save); 856 record_label_chunks(devs); 857 } 858 else 859 msg = "A most prudent choice!"; 860 break; 861 862 case 'Q': --- 12 unchanged lines hidden --- |