New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.5.x] Refs #3395: correct detection of vzps - branch 3.5 #1468

Closed

ncharles wants to merge 3 commits into cfengine:3.5.x from ncharles:correct_vz_detection_3.5

Contributor

ncharles commented Feb 25, 2014

No description provided.

ncharles added 2 commits

February 25, 2014 12:48


          Refs #3395: correct detection of vzps - branch 3.5

d28e6d8


          fixing the command to vzps

467a00b

ediosyncratic reviewed

View reviewed changes

libpromises/sysinfo.c

@@ @@ -93,6 +94,7 @@ @@
               static const char *CLASSATTRIBUTES[PLATFORM_CONTEXT_MAX][3] =
               {
                   {"-", "-", "-"},            /* as appear here are matched. The fields are sysname and machine */
+                  {"virt_host_vz_vzps", ".*", ".*"},      /* VZ Host with vzps installed (virt_host_vz_vzps) */

Contributor

ediosyncratic Feb 25, 2014

The parenthetical (virt_host_vz_vzps) in the comment is superfluous. What would be more useful (to me) would be some account of what on earth VZ and vzps might be ...

Contributor

ediosyncratic Feb 25, 2014

Note that "(see OpenVZ_Detect() for details)" would be an entirely suitable explanation, here. A little more documentation there would be good, though.

Contributor Author

ncharles Feb 27, 2014

i'm simply backporting #956 with a correction, so that it works as advertised. But i'll add comments, that's indeed better


          Adding comments

072908b

cfengine-review-bot commented Jul 7, 2014

Can one of the admins verify this patch?

4 similar comments

cfengine-review-bot commented Jul 7, 2014

Can one of the admins verify this patch?

cfengine-review-bot commented Jul 7, 2014

Can one of the admins verify this patch?

cfengine-review-bot commented Nov 3, 2014

Can one of the admins verify this patch?

cfengine-review-bot commented Nov 11, 2014

Can one of the admins verify this patch?

Contributor

jimis commented Mar 20, 2015

I'm closing this as it refers to 3.5.x branch, if this is still an issue please submit a pull request for master branch, cherry-picking will be done after merging in master.

BTW I don't understand what you mean by "Refs #3995". What is #3995?

jimis closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet