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.

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

Fixes #125 Symlink /opt to storage disk #127

Merged
merged 1 commit into from
Sep 18, 2017
Merged

Fixes #125 Symlink /opt to storage disk #127

merged 1 commit into from
Sep 18, 2017

Conversation

gbraad
Copy link
Member

@gbraad gbraad commented Jul 21, 2017 •
edited
Loading

Fixes #125

@gbraad gbraad force-pushed the opt branch 3 times, most recently from f52efe5 to a65917f Compare July 24, 2017 03:37
@gbraad
Copy link
Member Author

gbraad commented Jul 24, 2017

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

praveenkumar
praveenkumar reviewed Jul 24, 2017
View reviewed changes
centos-7.template Outdated
chmod +x cert-gen.sh
mv cert-gen.sh /opt
base64 -d < cert-gen.sh.base64 > minishift-cert-gen
rm cert-gen.sh.base64
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to put rm -fr ...? It should not break if user-interaction required.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the action is performed as root on a regular file. if it fails, something bad is happening...

scripts/handle-user-data
@@ -23,7 +23,7 @@ mount_partitions() {

# Just in case, the links will fail if not
umount -f /var/lib/docker || true
rm -rf /var/lib/docker /var/lib/boot2docker /etc/docker /var/lib/minishift
rm -rf /var/lib/docker /var/lib/boot2docker /etc/docker /var/lib/minishift /opt
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@hferentschik
Copy link
Member

Would be nice to stay consistent with the commit messages.

@coolbrg
Copy link
Contributor

coolbrg commented Aug 16, 2017

@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
Copy link
Member Author

gbraad commented Aug 16, 2017

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

@coolbrg
Copy link
Contributor

coolbrg commented Aug 16, 2017

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
Copy link
Member Author

gbraad commented Aug 17, 2017

Rebased

@gbraad gbraad mentioned this pull request Aug 18, 2017
Closed
@minishift minishift deleted a comment from coolbrg Aug 23, 2017
@minishift minishift deleted a comment from coolbrg Aug 23, 2017
@minishift minishift deleted a comment from coolbrg Aug 24, 2017
@LalatenduMohanty
Copy link
Member

@gbraad Is it ready to be merged?

@gbraad
Copy link
Member Author

gbraad commented Sep 7, 2017 via email

@LalatenduMohanty
Copy link
Member

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

@minishift minishift deleted a comment from coolbrg Sep 8, 2017
@minishift minishift deleted a comment from coolbrg Sep 8, 2017
@coolbrg
Copy link
Contributor

coolbrg commented Sep 13, 2017

retest this please

1 similar comment
@praveenkumar
Copy link
Collaborator

retest this please

@praveenkumar praveenkumar merged commit 3f34a64 into minishift:master Sep 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@praveenkumar praveenkumar praveenkumar left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gbraad @hferentschik @coolbrg @LalatenduMohanty @praveenkumar