Changeset 1714 in ProjectBuilder for devel/pb-modules

Timestamp:

Mar 10, 2013, 6:17:47 PM (12 years ago)

Author:

Bruno Cornec

Message:

• remove param vmntpcmd and use oscmdntp instead placed in pb.conf
• Improve ntp handling for setupvm by adding a call to date when ntpdate is failing
• Update appropriate docs
• Fix pb_get_sudocmds which was using @_ directly which was impacting parameters in the calling function, and removed e.g. the ntp server name from the cmd line !
• TODO: if a ntpd server is running, avoid doing all ntp/date stuff

Location:

devel/pb-modules/etc

Files:

• pb.conf (modified) (3 diffs)
• pb.conf.pod (modified) (3 diffs)

devel/pb-modules/etc/pb.conf

@@ -331 +331 @@
 #
 rbsmindep fedora-16 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
+#
+rbsmindep fedora-17 = ConsoleKit-libs,audit-libs,basesystem,bash,bzip2-libs,c-ares,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,cyrus-sasl-lib,db4,dbus,dbus-libs,device-mapper,device-mapper-libs,dhclient,e2fsprogs,e2fsprogs-libs,elfutils-libelf,expat,fedora-release,fedora-release-notes,file,file-libs,filesystem,findutils,gamin,gawk,gdbm,glib2,glibc,glibc-common,gnupg2,gpgme,grep,info,initscripts,iproute,iputils,keyutils-libs,krb5-libs,libacl,libattr,libcap,libcom_err,libcurl,libgcc,libgcrypt,libgpg-error,libidn,libselinux,libsepol,libssh2,libstdc++,libusb,libxml2,linux-atm-libs,logrotate,lua,mingetty,module-init-tools,ncurses,ncurses-base,ncurses-libs,net-tools,nspr,nss,nss-softokn,nss-softokn-freebl,nss-util,openldap,openssl,pam,passwd,pcre,pinentry,popt,procps,psmisc,pth,pygpgme,python,python-iniparse,python-libs,python-pycurl,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,rsyslog,sed,setup,shadow-utils,sqlite,sysvinit-tools,tzdata,udev,vim-minimal,xz-libs,yum,yum-metadata-parser,zlib
 #
 rbsmindep centos-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,centos-release,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,yum-metadata-parser,zlib
@@ -647 +649 @@
 ospathcmd-halt default = /sbin/halt
 
+oscmdntp default = /usr/sbin/ntpdate
+#oscmdntp opensuse-11.0-i386 = sntp -P no -r
+#oscmdntp opensuse-11.0-x86_64 = sntp -P no -r
+
 # Do you want pb to create a dedicated SSH key pair to dialog with VM|RM
 # or do you prefer to use an existing SSH Agent instead and existing keys
@@ -673 +679 @@
 # Number of process in // for pb
 #pbparallel pb = 2
-#
+
+
+# Distros may have different modes for /etc/sudoers
+ossudoersmode default = 440
+ossudoersmode suse-10.2 = 640
+
 
 #

devel/pb-modules/etc/pb.conf.pod

@@ -725 +725 @@
  Nature: Optional
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: NTP server to contact for time accuracy with B<rmntpcmd> before building.
+ Value: NTP server to contact for time accuracy with B<ospathcmd-ntpdate> before building.
  Conffile: rm
  Example: rmntp default = 1.pool.ntp.org
-
-=item B<rmntpcmd>
-
- Nature: Mandatory
- Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
- Value: NTP command to use to perform time synchronization with the B<rmntp> server. Use full path name, as this command will be used in the sudoers file to allow its launch by root.
- Conffile: rm
- Example: rmntpcmd default = /usr/sbin/ntpdate,rmntpcmd opensuse-10.1-i386 = /usr/sbin/sntp -P no -r
 
 =item B<rmpath>
@@ -841 +833 @@
  Nature: Optional
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: NTP server to contact for time accuracy with B<ventpcmd> before building.
+ Value: NTP server to contact for time accuracy with B<ospathcmd-ntpdate> before building.
  Conffile: ve
  Example: ventp default = 1.pool.ntp.org
-
-=item B<ventpcmd>
-
- Nature: Mandatory
- Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: NTP command to use to perform time synchronization with the B<ventp> server. Use full path name, as this command will be used in the sudoers file to allow its launch by root.
- Conffile: ve
- Example: ventpcmd default = /usr/sbin/ntpdate
 
 =item B<vepath>
@@ -953 +937 @@
  Nature: Optional
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: NTP server to contact for time accuracy with B<vmntpcmd> before building.
+ Value: NTP server to contact for time accuracy with B<ospathcmd-ntpdate> before building.
  Conffile: vm
  Example: vmntp default = 1.pool.ntp.org
-
-=item B<vmntpcmd>
-
- Nature: Mandatory
- Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
- Value: NTP command to use to perform time synchronization with the B<vmntp> server. Use full path name, as this command will be used in the sudoers file to allow its launch by root.
- Conffile: vm
- Example: vmntpcmd default = /usr/sbin/ntpdate,vmntpcmd opensuse-11.0-i386 = /usr/sbin/sntp -P no -r
 
 =item B<vmopt>