Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/Makefile	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
@@ -50,5 +50,4 @@
 	app/trace \
 	app/top \
-	app/netstart \
 	app/netecho \
 	app/nettest1 \
Index: pace/app/netstart/Makefile
===================================================================
--- uspace/app/netstart/Makefile	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# - The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-USPACE_PREFIX = ../..
-LIBS = 
-EXTRA_CFLAGS = 
-
-BINARY = netstart
-
-SOURCES = \
-	netstart.c
-
-include $(USPACE_PREFIX)/Makefile.common
Index: pace/app/netstart/netstart.c
===================================================================
--- uspace/app/netstart/netstart.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ 	(revision )
@@ -1,91 +1,0 @@
-/*
- * Copyright (c) 2009 Lukas Mejdrech
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup net
- * @{
- */
-
-/** @file
- * Start the networking subsystem.
- */
-
-#define NAME  "netstart"
-
-#include <async.h>
-#include <stdio.h>
-#include <task.h>
-#include <str_error.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <ipc/net_net.h>
-
-#include <net/modules.h>
-
-/** Start a module.
- *
- * @param[in] desc	The module description
- * @param[in] path	The module absolute path.
- * @returns		True on succesful spanwning.
- * @returns		False on failure
- */
-static bool spawn(const char *desc, const char *path)
-{
-	int rc;
-
-	printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-	rc = task_spawnl(NULL, path, path, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-		    str_error(rc));
-		return false;
-	}
-	
-	return true;
-}
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	
-	if (!spawn("networking service", "/srv/net"))
-		return EINVAL;
-	
-	printf("%s: Initializing networking\n", NAME);
-	
-	int net_phone = connect_to_service(SERVICE_NETWORKING);
-	rc = ipc_call_sync_0_0(net_phone, NET_NET_STARTUP);
-	if (rc != EOK) {
-		fprintf(stderr, "%s: Startup error %d\n", NAME, rc);
-		return rc;
-	}
-	
-	return EOK;
-}
-
-/** @}
- */
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/srv/net/net/net.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
@@ -77,4 +77,6 @@
 GENERIC_CHAR_MAP_IMPLEMENT(measured_strings, measured_string_t);
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
+
+static int startup(void);
 
 /** Add the configured setting to the configuration map.
@@ -337,4 +339,9 @@
 		goto out;
 	
+	rc = startup();
+	if (rc != EOK)
+		goto out;
+	
+	task_retval(0);
 	async_manager();