[arch-dev-public] [signoff] initscripts-2011.06.1-1

[Tom Gundersen]

On Wed, Jun 1, 2011 at 7:03 PM, Eric Bélanger <snowmaniscool at gmail.com> wrote:
> I noticed that you removed the NETWORKS=() line (and related comments)
> in the default rc.conf. Is that intended? If so, what's the new way to
> tell netfcg what profile to use? The net-profiles daemon from the
> latest netcfg still use that array.

That's not intended, I guess. Thanks for spotting it!

Dave, does the below patch look ok to you?

Cheers,

Tom

>From f224a70255b175378867c3a7b80e8c8bdf9b5f96 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg at jklm.no>
Date: Wed, 1 Jun 2011 21:53:21 +0200
Subject: [PATCH] fixup: network: deprecate net-tools

Commit a3314c7697 deleted a bit too much of the comments from rc.conf.

This patch restores the comments/example used by netcfg.

Signed-off-by: Tom Gundersen <teg at jklm.no>
---
 rc.conf |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/rc.conf b/rc.conf
index 534112f..efcdf0e 100644
--- a/rc.conf
+++ b/rc.conf
@@ -92,6 +92,17 @@ gateway=
 # This is required if your root device is on NFS.
 NETWORK_PERSIST="no"

+# Enable these network profiles at boot-up.  These are only useful
+# if you happen to need multiple network configurations (ie, laptop users)
+#   - set to 'menu' to present a menu during boot-up (dialog package required)
+#   - prefix an entry with a ! to disable it
+#
+# Network profiles are found in /etc/network.d
+#
+# This now requires the netcfg package
+#
+#NETWORKS=(main)
+
 # -----------------------------------------------------------------------
 # DAEMONS
 # -----------------------------------------------------------------------
-- 
1.7.5.2