Changeset 1105 in ProjectBuilder

Timestamp:

Nov 14, 2010, 3:09:23 AM (13 years ago)

Author:

Bruno Cornec

Message:

• No error message if chcon fails in setupvm
• Add support for RHEL6 setupvm and improve Fedora as well

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf

@@ -121 +121 @@
 osrelexpr fedora = Fedora .*release (\d+) \(
 osrelexpr vmware = VMware ESX Server (\d+) \(
-osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(
+# If you want to differentiate .release for RHEL
+#osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(
+osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9]+).* \(
 osrelexpr centos = .*CentOS .*release ([0-9]).* 
 osrelexpr redhat = Red Hat Linux release (.+) \(
@@ -326 +328 @@
 ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
 # Fedora - Module-Build first for processing as needed by others
-osperldep fedora = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
-ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora = File-MimeInfo,File-BaseDir,Mail-Sendmail
+ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils,perl-Module-Build,perl-Date-Manip
+osperldep fedora-12 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-12 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-11 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-11 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-10 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-10 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-9 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-9 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-8 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-8 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-7 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-7 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-6 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-6 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-5 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
+osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
+ospkgdep fedora-4 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
 # fprintd-pam
 # Slack - Module-Build first for processing as needed by others
@@ -343 +363 @@
 osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
 ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
+# Tested
+osperldep rhel-6 = File-MimeInfo,File-BaseDir,Mail-Sendmail
+ospkgdep rhel-6 = wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build
+#
 osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
 ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip,diffutils

devel/pb/bin/pb

@@ -519 +519 @@
     pb_log(0, "Please ensure that sshd is running in your VM by default\n");
     pb_log(0, "and that it allows remote root login (PermitRootLogin yes in /etc/ssh/sshd_config)\n");
-    pb_log(0, "Also ensure that network is up, firewalling correctly configured, and perl and scp/ssh installed\n");
+    pb_log(0, "Also ensure that network is up, firewalling correctly configured\n");
+    pb_log(0, "and perl, sudo, ntpdate and scp/ssh installed\n");
     pb_log(0, "You should then be able to login with ssh -p VMPORT root\@localhost (if VM started with pb)\n");
 } elsif ($action =~ /^setupve$/) {
@@ -2357 +2358 @@
         $key = "\Q$zero1";
 
-        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; if [ -x /usr/bin/chcon ]; then /usr/bin/chcon -Rt home_ssh_t .ssh 2> /dev/null; fi\"","Copying local keys to $vtype. This may require the root password");
+        # We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1
+        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; if [ -x /usr/bin/chcon ]; then /usr/bin/chcon -Rt home_ssh_t .ssh 2> /dev/null; /bin/true; fi\"","Copying local keys to $vtype. This may require the root password");
         # once this is done, we can do what we want on the VM remotely
     } elsif ($vtype eq "ve") {