[BACK]Return to upgrade.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / distrib / utils / sysinst

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/distrib/utils/sysinst/Attic/upgrade.c between version 1.44 and 1.45

version 1.44, 2003/12/28 05:30:47 version 1.45, 2004/04/18 21:34:56
Line 87  do_upgrade(void)
Line 87  do_upgrade(void)
         if (save_X())          if (save_X())
                 return;                  return;
   
   #if 0
         /*          /*
          * Move target /etc -> target /etc.old so existing configuration           * Move target /etc -> target /etc.old so existing configuration
          * isn't overwritten by upgrade.           * isn't overwritten by upgrade.
Line 95  do_upgrade(void)
Line 96  do_upgrade(void)
                 merge_X();                  merge_X();
                 return;                  return;
         }          }
   #endif
   
         /* Do any md updating of the file systems ... e.g. bootblocks,          /* Do any md updating of the file systems ... e.g. bootblocks,
            copy file systems ... */             copy file systems ... */
Line 109  do_upgrade(void)
Line 111  do_upgrade(void)
         wclear(stdscr);          wclear(stdscr);
         wrefresh(stdscr);          wrefresh(stdscr);
   
         if (get_and_unpack_sets(MSG_upgrcomplete, MSG_abortupgr) != 0)          if (get_and_unpack_sets(1, MSG_upgrcomplete, MSG_abortupgr) != 0)
                 return;                  return;
   
   #if 0
         /* Copy back any files we should restore after the upgrade.*/          /* Copy back any files we should restore after the upgrade.*/
         if (sets_installed & SET_ETC)          if (sets_installed & SET_ETC)
                 merge_etc();                  merge_etc();
   #endif
         merge_X();          merge_X();
   
         sanity_check();          sanity_check();
 }  }
   
   #if 0
 /*  /*
  * save target /etc files.   * save target /etc files.
  * if target /etc.old exists, print a warning message and give up.   * if target /etc.old exists, print a warning message and give up.
Line 197  restore_etc(void)
Line 202  restore_etc(void)
   
         tp = target_prefix();          tp = target_prefix();
         run_program(0, "mv -f %s/etc.old/* %s/etc", tp, tp);          run_program(0, "mv -f %s/etc.old/* %s/etc", tp, tp);
         run_program(0, "rmdir  %s/etc.old", tp);          /* rmdir isn't in our root, chroot and use the one in the target */
           run_program(RUN_CHROOT, "rmdir /etc.old");
         etc_saved = 0;          etc_saved = 0;
 }  }
   #endif
   
 /*  /*
  * Save X symlink to X.old so it can be recovered later   * Save X symlink to X.old so it can be recovered later
Line 285  do_reinstall_sets(void)
Line 291  do_reinstall_sets(void)
                 return;                  return;
   
         /* Unpack the distribution. */          /* Unpack the distribution. */
         if (get_and_unpack_sets(MSG_unpackcomplete, MSG_abortunpack) != 0)          if (get_and_unpack_sets(0, MSG_unpackcomplete, MSG_abortunpack) != 0)
                 return;                  return;
   
         sanity_check();          sanity_check();
Legend:
Removed from v.1.44  
changed lines
  Added in v.1.45
CVSweb <webmaster@jp.NetBSD.org>