Skip to content
This repository has been archived by the owner on Nov 24, 2022. It is now read-only.

Some LXC #71

Closed
wants to merge 13 commits into from
Closed

Some LXC #71

wants to merge 13 commits into from

Conversation

Val
Copy link
Contributor

@Val Val commented May 3, 2013

  • additional lxc.cgroup.devices from ubuntu template
  • avoid trouble when using lxc-console

@fgrehm
Copy link
Owner

fgrehm commented May 3, 2013

@Val would you be able to git rebase this? as this is related to the other PR I'm able to merge them in as of now ;)

@Val
Copy link
Contributor Author

Val commented May 3, 2013

Removed one conflicting commit on boxes/debian/lxc-template (fstab /dev/shm line removal)

is it ok ?

@fgrehm
Copy link
Owner

fgrehm commented May 3, 2013

I'm not sure, I'd expect to have 3 commits (d84137b, 362c7c8 and 14ab042) to merge this PR on top of the debian-boxes branch. If you can't do that don't worry, I can cherry pick those guys alone :D

@fgrehm
Copy link
Owner

fgrehm commented May 3, 2013

Actually, d84137b has been cherry picked already

@Val
Copy link
Contributor Author

Val commented May 3, 2013

Ok, sorry i didn't understand :-/

@fgrehm
Copy link
Owner

fgrehm commented May 3, 2013

no problem, I'll see if I can gist you a step by step so that you understand better in case we need to do this again ;-)

@fgrehm
Copy link
Owner

fgrehm commented May 4, 2013

@Val I've just cherry picked your commits on my debian-boxes by hand. I'm not sure which commands you ran over there but I checked out your repo and the git tree was kinda weird with duplicated commits, I thought that a git rebase upstream/debiand-boxes would do the trick. Anyways, tks a lot for the work on building those boxes, it will serve as another "live example" of the documentation I need to write about building base boxes :-)

Just so you know I'll probably merge the changes back into master and release the boxes over the weekend along with a new version of the plugin with a few bug fixes.

@fgrehm fgrehm closed this May 4, 2013
@Val
Copy link
Contributor Author

Val commented May 4, 2013

Hi Fabio,

Sorry for the wrong rebase, i'm not used to git/github workflow.
Thanks for merging too.

Regards.

2013/5/4 Fabio Rehm notifications@github.com

@Val I've just cherry picked your commits on my debian-boxes by hand. I'm
not sure which commands you ran over there but I checked out your repo and
the git tree was kinda weird with duplicated commits, I thought that a git
rebase upstream/debiand-boxes would do the trick. Anyways, tks a lot for the
work on building those boxes, it will serve as another "live example" of the
documentation I need to write about building base boxes :-)

Just so you know I'll probably merge the changes back into master and
release the boxes over the weekend along with a new version of the plugin
with a few bug fixes.

@fgrehm
Copy link
Owner

fgrehm commented May 6, 2013

@Val not a problem :-) I'm uploading the new base boxes to Dropbox now, I'll just need to handle #68 before "officially" releasing them

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants