| installUpgrade.c (88515) | installUpgrade.c (93595) |
|---|---|
| 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/installUpgrade.c 88515 2001-12-27 01:57:18Z sheldonh $ | 7 * $FreeBSD: head/usr.sbin/sysinstall/installUpgrade.c 93595 2002-04-01 21:35:24Z obrien $ |
| 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 --- 246 unchanged lines hidden (view full) --- 262 "targets. Unfortunately, this is not the way to upgrade your\n" 263 "sources - please use CTM or CVSup or some other method which\n" 264 "handles ``deletion events'', unlike this particular feature.\n\n" 265 "Your existing /usr/src will not be affected by this upgrade.\n"); 266 } 267 268 if (extractingBin) { 269 while (!*saved_etc) { | 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 --- 246 unchanged lines hidden (view full) --- 262 "targets. Unfortunately, this is not the way to upgrade your\n" 263 "sources - please use CTM or CVSup or some other method which\n" 264 "handles ``deletion events'', unlike this particular feature.\n\n" 265 "Your existing /usr/src will not be affected by this upgrade.\n"); 266 } 267 268 if (extractingBin) { 269 while (!*saved_etc) { |
| 270 char *cp = msgGetInput("/usr/tmp/etc", "Under which directory do you wish to save your current /etc?"); | 270 char *cp = msgGetInput("/var/tmp/etc", "Under which directory do you wish to save your current /etc?"); |
| 271 272 if (!cp || !*cp || Mkdir(cp)) { 273 if (msgYesNo("Directory was not specified, was invalid or user selected Cancel.\n\n" 274 "Doing an upgrade without first backing up your /etc directory is a very\n" 275 "bad idea! Do you want to go back and specify the save directory again?") != 0) 276 break; 277 } 278 else { --- 168 unchanged lines hidden (view full) --- 447 systemCreateHoloshell(); 448 } 449 450 if (!mediaVerify() || !DEVICE_INIT(mediaDevice)) { 451 msgNotify("Upgrade: Couldn't initialize media."); 452 return DITEM_FAILURE; 453 } 454 | 271 272 if (!cp || !*cp || Mkdir(cp)) { 273 if (msgYesNo("Directory was not specified, was invalid or user selected Cancel.\n\n" 274 "Doing an upgrade without first backing up your /etc directory is a very\n" 275 "bad idea! Do you want to go back and specify the save directory again?") != 0) 276 break; 277 } 278 else { --- 168 unchanged lines hidden (view full) --- 447 systemCreateHoloshell(); 448 } 449 450 if (!mediaVerify() || !DEVICE_INIT(mediaDevice)) { 451 msgNotify("Upgrade: Couldn't initialize media."); 452 return DITEM_FAILURE; 453 } 454 |
| 455 saved_etc = "/usr/tmp/etc"; | 455 saved_etc = "/var/tmp/etc"; |
| 456 Mkdir(saved_etc); 457 msgNotify("Preserving /etc directory.."); 458 if (vsystem("tar -cpBf - -C /etc . | tar -xpBf - -C %s", saved_etc)) { 459 msgNotify("Unable to backup your /etc into %s.", saved_etc); 460 return DITEM_FAILURE; 461 } 462 463 if (file_readable("/kernel")) { --- 37 unchanged lines hidden --- | 456 Mkdir(saved_etc); 457 msgNotify("Preserving /etc directory.."); 458 if (vsystem("tar -cpBf - -C /etc . | tar -xpBf - -C %s", saved_etc)) { 459 msgNotify("Unable to backup your /etc into %s.", saved_etc); 460 return DITEM_FAILURE; 461 } 462 463 if (file_readable("/kernel")) { --- 37 unchanged lines hidden --- |