Changeset 1715 in ProjectBuilder

Timestamp:

Mar 10, 2013, 6:44:20 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds a parameter for the mode of the sudoers file instead of hard-coding

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -683 +683 @@
 # Distros may have different modes for /etc/sudoers
 ossudoersmode default = 440
-ossudoersmode suse-10.2 = 640
+ossudoersmode suse-10.0 = 640
+ossudoersmode suse-10.1 = 640
+ossudoersmode opensuse-10.2 = 640
+ossudoersmode sles-9 = 640
+ossudoersmode sles-10 = 640
 
 

devel/pb/bin/pb

@@ -2410 +2410 @@
     # For VE we need to change the owner manually
     if ($cmt =~ /^VE/) {
+        my $sudomode = pb_distro_get_param($pbos,pb_conf_get("ossudoersmode"));
         my $res = pb_system("$shcmdroot sed -i '/requiretty/d' /etc/sudoers","Removing potential requiretty in sudoers","quiet");
-        pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers ; $shcmdroot chown root:root /etc/sudoers ; $shcmdroot chmod 440 /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
+        pb_system("$shcmdroot sed '/requiretty/d' /etc/sudoers > /tmp/sudoers.new ; mv /tmp/sudoers.new $tpdir/tmp/sudoers.new ; $shcmdroot mv /tmp/sudoers.new /etc/sudoers ; $shcmdroot chown root:root /etc/sudoers ; $shcmdroot chmod $sudomode /etc/sudoers","Removing again potential requiretty in sudoers as sed -i failed") if (($res ne 0) && (-f "$tpdir/etc/sudoers"));
         pb_system("$shcmd \"sudo $chowncommand -R $mac $tdir\"","Adapt owner in $tdir to $mac");
     }
@@ -3415 +3416 @@
 EOF
     }
+    my $sudomode = pb_distro_get_param($pbos,pb_conf_get("ossudoersmode"));
     print SCRIPT << 'EOF';
 close(PBOUT);
 rename("$file.new",$file);
-chmod 0440,$file;
+EOF
+    print SCRIPT << "EOF";
+chmod 0$sudomode,\$file;
 
 EOF
@@ -3437 +3441 @@
 # We may need a proxy configuration. Get it from the local env
 pb_apply_conf_proxy($pbos);
-
-# Suse wants sudoers as 640
-if ((($pbos->{'name'} eq "sles") && (($pbos->{'version'} =~ /10/) || ($pbos->{'version'} =~ /9/))) || (($pbos->{'name'} eq "opensuse") && ($pbos->{'version'} =~ /10.[012]/))) {
-    chmod 0640,$file;
-}
 
 # First install all required packages