Changeset 1105


Ignore:
Timestamp:
Nov 14, 2010, 3:09:23 AM (9 years ago)
Author:
bruno
Message:
  • No error message if chcon fails in setupvm
  • Add support for RHEL6 setupvm and improve Fedora as well
Location:
devel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r1100 r1105  
    121121osrelexpr fedora = Fedora .*release (\d+) \(
    122122osrelexpr vmware = VMware ESX Server (\d+) \(
    123 osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(
     123# If you want to differentiate .release for RHEL
     124#osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9.]+).* \(
     125osrelexpr rhel = Red Hat (?:Enterprise Linux|Linux Advanced Server) .*release ([0-9]+).* \(
    124126osrelexpr centos = .*CentOS .*release ([0-9]).*
    125127osrelexpr redhat = Red Hat Linux release (.+) \(
     
    326328ospkgdep asianux = wget,make,perl-Date-Manip,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    327329# Fedora - Module-Build first for processing as needed by others
    328 osperldep fedora = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
    329 ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     330osperldep fedora = File-MimeInfo,File-BaseDir,Mail-Sendmail
     331ospkgdep fedora = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils,perl-Module-Build,perl-Date-Manip
     332osperldep fedora-12 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     333ospkgdep fedora-12 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     334osperldep fedora-11 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     335ospkgdep fedora-11 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     336osperldep fedora-10 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     337ospkgdep fedora-10 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     338osperldep fedora-9 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     339ospkgdep fedora-9 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     340osperldep fedora-8 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     341ospkgdep fedora-8 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     342osperldep fedora-7 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     343ospkgdep fedora-7 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     344osperldep fedora-6 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     345ospkgdep fedora-6 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     346osperldep fedora-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     347ospkgdep fedora-5 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
     348osperldep fedora-4 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail,Date-Manip
     349ospkgdep fedora-4 = wget,make,perl-ExtUtils-MakeMaker,rpm-build,patch,ntp,diffutils
    330350# fprintd-pam
    331351# Slack - Module-Build first for processing as needed by others
     
    343363osperldep centos-5 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    344364ospkgdep centos-5 = wget,make,ntp,patch,perl-DateManip,rpm-build,diffutils
     365# Tested
     366osperldep rhel-6 = File-MimeInfo,File-BaseDir,Mail-Sendmail
     367ospkgdep rhel-6 = wget,make,ntpdate,patch,perl-Date-Manip,rpm-build,diffutils,perl-Module-Build
     368#
    345369osperldep rhel-3 = Module-Build,File-MimeInfo,File-BaseDir,Mail-Sendmail
    346370ospkgdep rhel-3 = wget,make,ntp,patch,perl-DateManip,diffutils
  • devel/pb/bin/pb

    r1102 r1105  
    519519    pb_log(0, "Please ensure that sshd is running in your VM by default\n");
    520520    pb_log(0, "and that it allows remote root login (PermitRootLogin yes in /etc/ssh/sshd_config)\n");
    521     pb_log(0, "Also ensure that network is up, firewalling correctly configured, and perl and scp/ssh installed\n");
     521    pb_log(0, "Also ensure that network is up, firewalling correctly configured\n");
     522    pb_log(0, "and perl, sudo, ntpdate and scp/ssh installed\n");
    522523    pb_log(0, "You should then be able to login with ssh -p VMPORT root\@localhost (if VM started with pb)\n");
    523524} elsif ($action =~ /^setupve$/) {
     
    23572358        $key = "\Q$zero1";
    23582359
    2359         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");
     2360        # We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1
     2361        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");
    23602362        # once this is done, we can do what we want on the VM remotely
    23612363    } elsif ($vtype eq "ve") {
Note: See TracChangeset for help on using the changeset viewer.