Use macros for package names so it's easier to update them in one

place (sysinstall.h) when packages change rev.

Change the way that the routing daemon is configured entirely, to
placate Joerg.  Also auto-load gated if it's specified, while we're at it.

1 files changed, 5 insertions, 5 deletions

diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index c85f444..5d2cfd2 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.47 1996/10/06 03:18:55 jkh Exp $
+ * $Id: package.c,v 1.48 1996/10/12 19:30:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -87,14 +87,14 @@ package_extract(Device *dev, char *name, Boolean depended)
     char path[511];
     int fd, ret;
 
-    /* If necessary, initialize the ldconfig hints */
-    if (!file_readable("/var/run/ld.so.hints"))
-	vsystem("ldconfig /usr/lib /usr/local/lib /usr/X11R6/lib");
-
     /* Check to make sure it's not already there */
     if (package_exists(name))
 	return DITEM_SUCCESS;
 
+    /* If necessary, initialize the ldconfig hints */
+    if (!file_readable("/var/run/ld.so.hints"))
+	vsystem("ldconfig /usr/lib /usr/local/lib /usr/X11R6/lib");
+
     if (!dev->init(dev)) {
 	msgConfirm("Unable to initialize media type for package extract.");
 	return DITEM_FAILURE;