search

minishift / minishift-centos-iso

CentOS based ISO as an alternative for boot2docker ISO
GNU Lesser General Public License v3.0
40 stars 33 forks source link

Fixes #125 Symlink /opt to storage disk #127

Closed gbraad closed 7 years ago

gbraad commented 7 years ago

Fixes #125

gbraad commented 7 years ago

also moves /opt/cert-gen.sh to /usr/local/bin/minishift-cert-gen

hferentschik commented 7 years ago

Would be nice to stay consistent with the commit messages.

coolbrg commented 7 years ago

@gbraad , need to rebase with upstream master as builds are failing due to it https://ci.centos.org/job/minishift-centos-iso-pr/130/console

gbraad commented 7 years ago

What do you mean with builds? Just this change fails...

coolbrg commented 7 years ago

What do you mean with builds? Just this change fails...

Builds means Jobs :) Check console logs here https://ci.centos.org/job/minishift-centos-iso-pr/130/console

10:58:26 + git rebase origin/master
10:58:26 First, rewinding head to replay your work on top of it...
10:58:26 Applying: Fixes #125 Symlink /opt to $(storage_disk)/opt
10:58:26 Using index info to reconstruct a base tree...
10:58:26 M  centos-7.template
10:58:26 M  rhel-7.template
10:58:26 M  scripts/handle-user-data
10:58:26 Falling back to patching base and 3-way merge...
10:58:26 Auto-merging scripts/handle-user-data
10:58:26 Auto-merging rhel-7.template
10:58:26 CONFLICT (content): Merge conflict in rhel-7.template
10:58:26 Auto-merging centos-7.template
10:58:26 CONFLICT (content): Merge conflict in centos-7.template
10:58:26 Failed to merge in the changes.
10:58:26 Patch failed at 0001 Fixes #125 Symlink /opt to $(storage_disk)/opt
10:58:26 The copy of the patch that failed is found in:
10:58:26    /home/minishift/workspace/minishift-centos-iso-pr/.git/rebase-apply/patch
10:58:26 
10:58:26 When you have resolved this problem, run "git rebase --continue".
10:58:26 If you prefer to skip this patch, run "git rebase --skip" instead.
10:58:26 To check out the original branch and stop rebasing, run "git rebase --abort".
gbraad commented 7 years ago

Rebased

LalatenduMohanty commented 7 years ago

@gbraad Is it ready to be merged?

gbraad commented 7 years ago

Yes

just #121 is causing headaches to pass the build

On Thu, Sep 7, 2017 at 1:45 PM, Lalatendu Mohanty notifications@github.com wrote:

@gbraad https://github.com/gbraad Is it ready to be merged?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/minishift/minishift-centos-iso/pull/127#issuecomment-327693522, or mute the thread https://github.com/notifications/unsubscribe-auth/AAAHZo5O_6g7yAtiUoBZeXvKFzyEK3XIks5sf4L6gaJpZM4Ofmxk .

--

Gerard Braad | http://gbraad.nl [ Doing Open Source Matters ]

LalatenduMohanty commented 7 years ago

Looks fine to me. I have not tested the PR locally though.

coolbrg commented 7 years ago

retest this please

praveenkumar commented 7 years ago

retest this please