Skip to content
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.

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

Rcfile as common arg #1122

Merged
merged 6 commits into from Aug 17, 2016
Merged

Rcfile as common arg #1122

merged 6 commits into from Aug 17, 2016

Conversation

Blub
Copy link
Member

@Blub Blub commented Aug 12, 2016

I put the c->configfile change into a separate commit - I'm unsure whether it would be a better idea to add a call for that or even let c->load_config() handle this, but that could be a potentially breaking change for some library users, so for now I went with just setting it directly.

@lxc-jenkins
Copy link

This pull request didn't trigger Jenkins as its author isn't in the whitelist.

An organization member must perform one of the following:

  • To have this branch tested by Jenkins, use the "ok to test" command.
  • To have a one time test done, use the "test this please" command.

Those commands are simple Github comments of the format: "jenkins: COMMAND"

@brauner
Copy link
Member

brauner commented Aug 12, 2016

jenkins: test this please

1 similar comment
@stgraber
Copy link
Member

jenkins: test this please

@Blub
Copy link
Member Author

Blub commented Aug 16, 2016

Changes in the update:

  • only includes --rcfile now, not -f as it otherwise conflicts with lxc-destroy's force option
  • added forgotten config load code to lxc-copy (previously only contained the usage change)

and rebased to current master

@brauner
Copy link
Member

brauner commented Aug 16, 2016

jenkins: test this please

2 similar comments
@brauner
Copy link
Member

brauner commented Aug 16, 2016

jenkins: test this please

@brauner
Copy link
Member

brauner commented Aug 16, 2016

jenkins: test this please

In almost all commands it's a useful addition to the -n
switch which is a common option, too.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
In order to cause c->is_defined() to become true.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
It doesn't have any effect on what lxc-top does and is only
accepted on account of being part of the common option list.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
@Blub
Copy link
Member Author

Blub commented Aug 17, 2016

Changes in the update:
undid the accidental removal of the -f option in lxc-attach

@brauner
Copy link
Member

brauner commented Aug 17, 2016

jenkins: test this please

@brauner brauner merged commit 6fe6560 into lxc:master Aug 17, 2016
z-image pushed a commit to z-image/lxc that referenced this pull request Oct 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants