Changeset 1105 in ProjectBuilder for devel/pb/bin/pb

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

File:

• devel/pb/bin/pb (modified) (2 diffs)

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") {