Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/utils/sysinst Check if the network is up before atte...



details:   https://anonhg.NetBSD.org/src/rev/59ee378e31f1
branches:  trunk
changeset: 779079:59ee378e31f1
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 30 19:05:29 2012 +0000

description:
Check if the network is up before attempting to install pkgin.  If not,
configure it.

diffstat:

 distrib/utils/sysinst/configmenu.c |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 7615f0d1b24d -r 59ee378e31f1 distrib/utils/sysinst/configmenu.c
--- a/distrib/utils/sysinst/configmenu.c        Mon Apr 30 17:27:50 2012 +0000
+++ b/distrib/utils/sysinst/configmenu.c        Mon Apr 30 19:05:29 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.2 2012/04/12 16:05:48 riz Exp $ */
+/* $NetBSD: configmenu.c,v 1.3 2012/04/30 19:05:29 riz Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -248,6 +248,13 @@
 
        char pattern[STRSIZE];
 
+       /* binary pkg config requires network at this point, so if
+          it's not already configured, do it. */
+       if (network_up == 0) {
+               if (config_network())
+                       mnt_net_config();
+       }
+
        process_menu(MENU_binpkg, NULL);
        make_url(pkgpath, &pkg, pkg_dir);
        if ( run_program(RUN_DISPLAY | RUN_PROGRESS | RUN_CHROOT,



Home | Main Index | Thread Index | Old Index