From 9519d51eb29b0a5881bc859e1c2b9b3b3a8abfa6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 2 Dec 2002 20:41:44 +0000
Subject: use output_with_perm()

---
 perl-install/network/tools.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install/network/tools.pm')

diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 55c8b8a89..48809e8ef 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -18,11 +18,10 @@ sub write_cnx_script {
 	$netc->{internet_cnx}{$type}{type} = $type2;
     } else {
 	foreach ($connect_file, $disconnect_file) {
-	    output("$prefix$_",
+	    output_with_perm("$prefix$_", 0755,
 '#!/bin/bash
 ' . if_(!$netc->{at_boot}, 'if [ "x$1" == "x--boot_time" ]; then exit; fi
 ') . $netc->{internet_cnx}{$netc->{internet_cnx_choice}}{$_});
-	chmod 0755, "$prefix$_";
 	}
     }
 }
@@ -223,7 +222,8 @@ sub disconnected {}
 
 
 sub write_initscript {
-    output("$prefix/etc/rc.d/init.d/internet", sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file));
+    output_with_perm("$prefix/etc/rc.d/init.d/internet", 0755,
+		     sprintf(<<'EOF', $connect_file, $connect_file, $disconnect_file, $disconnect_file));
 #!/bin/bash
 #
 # internet       Bring up/down internet connection
@@ -267,7 +267,6 @@ sub write_initscript {
 esac
 exit 0
 EOF
-    chmod 0755, "$prefix/etc/rc.d/init.d/internet";
     $::isStandalone ? system("/sbin/chkconfig --add internet") : do {
 	symlinkf("../init.d/internet", "$prefix/etc/rc.d/rc$_") foreach
 	  '0.d/K11internet', '1.d/K11internet', '2.d/K11internet', '3.d/S89internet', '5.d/S89internet', '6.d/K11internet';
-- 
cgit v1.2.1