Summary: osaf: Fix name collision between OpenSAF CLC scripts and systemd scripts [#1921] Review request for Trac Ticket(s): 1921 Peer Reviewer(s): Mathi Pull request to: Affected branch(es): opensaf-4.7.x, opensaf-5.0.x, default(5.1) Development branch: default
-------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts y SAF services n OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 8542d91153376d37a41ad862045b59ddeb5d8e02 Author: Anders Widell <[email protected]> Date: Tue, 19 Jul 2016 16:00:48 +0200 osaf: Fix name collision between OpenSAF CLC scripts and systemd scripts [#1921] Rename the shell environment variable "prog" to "osafprog" in the OpenSAF service CLC scripts, to avoid a name collition with a variable in the file /lib/lsb/init-functions.d/40-systemd which gets included when we source the file /lib/lsb/init-functions in Ubuntu 16.04 Complete diffstat: ------------------ osaf/services/infrastructure/dtms/scripts/osaf-dtm.in | 28 ++++++++++++++-------------- osaf/services/infrastructure/dtms/scripts/osaf-transport-monitor.in | 10 +++++----- osaf/services/infrastructure/dtms/scripts/osaf-transport.in | 4 ++-- osaf/services/infrastructure/fm/fms/scripts/osaf-fmd.in | 18 +++++++++--------- osaf/services/infrastructure/nid/scripts/opensafd.in | 36 ++++++++++++++++++------------------ osaf/services/infrastructure/rde/scripts/osaf-rded.in | 20 ++++++++++---------- osaf/services/saf/amf/amfd/scripts/osaf-amfd.in | 16 ++++++++-------- osaf/services/saf/amf/amfnd/scripts/osaf-amfnd.in | 16 ++++++++-------- osaf/services/saf/amf/amfwdog/scripts/osaf-amfwd.in | 18 +++++++++--------- osaf/services/saf/clmsv/clms/scripts/osaf-clmd.in | 18 +++++++++--------- osaf/services/saf/clmsv/nodeagent/scripts/osaf-clmna.in | 18 +++++++++--------- osaf/services/saf/cpsv/cpd/scripts/osaf-ckptd.in | 16 ++++++++-------- osaf/services/saf/cpsv/cpnd/scripts/osaf-ckptnd.in | 18 +++++++++--------- osaf/services/saf/edsv/eds/scripts/osaf-evtd.in | 16 ++++++++-------- osaf/services/saf/glsv/gld/scripts/osaf-lckd.in | 16 ++++++++-------- osaf/services/saf/glsv/glnd/scripts/osaf-lcknd.in | 18 +++++++++--------- osaf/services/saf/immsv/immd/scripts/osaf-immd.in | 18 +++++++++--------- osaf/services/saf/immsv/immnd/scripts/osaf-immnd.in | 20 ++++++++++---------- osaf/services/saf/logsv/lgs/scripts/osaf-logd.in | 18 +++++++++--------- osaf/services/saf/mqsv/mqd/scripts/osaf-msgd.in | 16 ++++++++-------- osaf/services/saf/mqsv/mqnd/scripts/osaf-msgnd.in | 18 +++++++++--------- osaf/services/saf/ntfsv/ntfs/scripts/osaf-ntfd.in | 18 +++++++++--------- osaf/services/saf/plmsv/plms/scripts/osaf-plmd.in | 18 +++++++++--------- osaf/services/saf/smfsv/smfd/scripts/osaf-smfd.in | 16 ++++++++-------- osaf/services/saf/smfsv/smfnd/scripts/osaf-smfnd.in | 18 +++++++++--------- 25 files changed, 223 insertions(+), 223 deletions(-) Testing Commands: ----------------- Start OpenSAF on Ubuntu 16.04 Testing, Expected Results: -------------------------- OpenSAF shall start Conditions of Submission: ------------------------- Ack from reviewer(s) Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y powerpc n n powerpc64 n n Reviewer Checklist: ------------------- [Submitters: make sure that your review doesn't trigger any checkmarks!] Your checkin has not passed review because (see checked entries): ___ Your RR template is generally incomplete; it has too many blank entries that need proper data filled in. ___ You have failed to nominate the proper persons for review and push. ___ Your patches do not have proper short+long header ___ You have grammar/spelling in your header that is unacceptable. ___ You have exceeded a sensible line length in your headers/comments/text. ___ You have failed to put in a proper Trac Ticket # into your commits. ___ You have incorrectly put/left internal data in your comments/files (i.e. internal bug tracking tool IDs, product names etc) ___ You have not given any evidence of testing beyond basic build tests. Demonstrate some level of runtime or other sanity testing. ___ You have ^M present in some of your files. These have to be removed. ___ You have needlessly changed whitespace or added whitespace crimes like trailing spaces, or spaces before tabs. ___ You have mixed real technical changes with whitespace and other cosmetic code cleanup changes. These have to be separate commits. ___ You need to refactor your submission into logical chunks; there is too much content into a single commit. ___ You have extraneous garbage in your review (merge commits etc) ___ You have giant attachments which should never have been sent; Instead you should place your content in a public tree to be pulled. ___ You have too many commits attached to an e-mail; resend as threaded commits, or place in a public tree for a pull. ___ You have resent this content multiple times without a clear indication of what has changed between each re-send. ___ You have failed to adequately and individually address all of the comments and change requests that were proposed in the initial review. ___ You have a misconfigured ~/.hgrc file (i.e. username, email etc) ___ Your computer have a badly configured date and time; confusing the the threaded patch review. ___ Your changes affect IPC mechanism, and you don't present any results for in-service upgradability test. ___ Your changes affect user manual and documentation, your patch series do not contain the patch that updates the Doxygen manual. ------------------------------------------------------------------------------ What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic patterns at an interface-level. Reveals which users, apps, and protocols are consuming the most bandwidth. Provides multi-vendor support for NetFlow, J-Flow, sFlow and other flows. Make informed decisions using capacity planning reports.http://sdm.link/zohodev2dev _______________________________________________ Opensaf-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensaf-devel
