2001-12-19 Arturo Espinosa Aldama <arturo@ximian.com>

	* network.pl.in (xst_network_get_replace_table): Use the
	new keyword for SuSE's suseconfig run.

	* replace.pl.in (xst_replace_run_entry): New "_always_" key
	forces call of the function.
	(xst_replace_from_table): same.

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b097f2..60e5ed3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-19  Arturo Espinosa Aldama  <arturo@ximian.com>
+
+	* network.pl.in (xst_network_get_replace_table): Use the
+	new keyword for SuSE's suseconfig run.
+
+	* replace.pl.in (xst_replace_run_entry): New "_always_" key
+	forces call of the function.
+	(xst_replace_from_table): same.
+
 2001-12-18  Arturo Espinosa Aldama  <arturo@ximian.com>
 
 	* platform.pl.in (check_debian): Correctly detect woody, which
diff --git a/network.pl.in b/network.pl.in
index d7e48b4..96360b7 100644
--- a/network.pl.in
+++ b/network.pl.in
@@ -2654,8 +2654,7 @@ sub xst_network_get_replace_table
 # We're calling this sepparated cuz we are going to call wvdial to activate.           
         [ "interface",     \&xst_network_suse70_activate_ppp ],
         [ "interface",     \&xst_network_interfaces_set,	 OLD_HASH ],
-# I use "interface" here to force the execution of SUSECONFIG.
-        [ "interface",     \&xst_file_run,                 SUSECONFIG ],
+        [ "_always_",      \&xst_file_run,                 SUSECONFIG ],
 		    ]
 			 }
 	  );
diff --git a/replace.pl.in b/replace.pl.in
index 58389c7..1533ce2 100644
--- a/replace.pl.in
+++ b/replace.pl.in
@@ -86,7 +86,7 @@ sub xst_replace_run_entry
   
   &xst_debug_print_line ("xst_replace_from_table: $key");
   return -1 if (!&xst_parse_replace_hash_values ($ncp, $values_hash));
-  push (@$ncp, $$values_hash{$key});
+  push (@$ncp, $$values_hash{$key}) unless $key eq "_always_";
   $res = -1 if &$proc (@$ncp);
   return $res;
 }
@@ -114,7 +114,7 @@ sub xst_replace_from_table
   {
     @cp = @$i;
     $key = shift (@cp);
-    if (exists $$values_hash{$key})
+    if ((exists $$values_hash{$key}) or ($key eq "_always_"))
     {
       $proc = shift (@cp);
       @files = &xst_parse_replace_files (shift (@cp), $fn);