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

FreeBSD 11.0 support #492

Merged
merged 5 commits into from
Nov 18, 2016
Merged

FreeBSD 11.0 support #492

merged 5 commits into from
Nov 18, 2016

Conversation

rickard-von-essen
Copy link
Collaborator

@rickard-von-essen rickard-von-essen commented Nov 11, 2015 •
edited
Loading

Changes compared with 10.2:

  1. http/freebsd-11.0/install.sh start and size have been adjusted to work:
< gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE

---
> gpart add -b 40 -s 88 -t freebsd-boot $DISKSLICE
  1. Switched to bsdinstall

TODO:

  • minimize.sh doesn't finish.

tas50
tas50 reviewed Apr 4, 2016
View reviewed changes
scripts/freebsd/update.sh
if [ "$major_version" -lt 11 ]; then
env PAGER=/bin/cat $freebsd_update fetch;
env PAGER=/bin/cat $freebsd_update install;
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

is freebsd_update deprecated or is this gated just to work around the failures when there's no new updates?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No this was just a quick work around that update fails when there are no patches to install. I have done a proper solution for boxcutter/bsd. I'll port that.

Thanks for reminding me.

@cheeseplus
Copy link
Contributor

Can we get this one rebased by chance? Release is right around the corner :D

@rickard-von-essen
Copy link
Collaborator Author

I was just about to rebase to the 11.0 beta 1. But I'll think I'll rework it a bit to include my proposal from #558. Any comments on that is very welcome.

@rickard-von-essen
Copy link
Collaborator Author

This should be ok now, just waiting for the RELEASE.

@cheeseplus
Copy link
Contributor

According to the schedule https://www.freebsd.org/releases/11.0R/schedule.html

RELEASE builds began on 28 September 2016
RELEASE Announcement should be October 5, 2016

Do we want to go ahead and start pushing?

@rickard-von-essen
Copy link
Collaborator Author

The release is not out yet, it was delayed. There was a email some days
ago saying the final build was on the way.

On Sep 30, 2016 6:08 PM, "Seth Thomas" notifications@github.com wrote:

According to the schedule https://www.freebsd.org/
releases/11.0R/schedule.html

RELEASE builds began on 28 September 2016
RELEASE Announcement should be October 5, 2016

Do we want to go ahead and start pushing?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#492 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAiCg4zZv1wTEz4k6OAS3HpIQlxj0e4tks5qvTPpgaJpZM4GgSmn
.

@rickard-von-essen
Copy link
Collaborator Author

See
https://lists.freebsd.org/pipermail/freebsd-announce/2016-September/001752.html

On Sep 30, 2016 6:48 PM, "Rickard von Essen" rickard.von.essen@gmail.com
wrote:

The release is not out yet, it was delayed. There was a email some days
ago saying the final build was on the way.

On Sep 30, 2016 6:08 PM, "Seth Thomas" notifications@github.com wrote:

According to the schedule https://www.freebsd.org/releas
es/11.0R/schedule.html

RELEASE builds began on 28 September 2016
RELEASE Announcement should be October 5, 2016

Do we want to go ahead and start pushing?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#492 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAiCg4zZv1wTEz4k6OAS3HpIQlxj0e4tks5qvTPpgaJpZM4GgSmn
.

@rosstimson
Copy link

Looking forward to seeing this merged now that FreeBSD 11 is now officially released.

@rickard-von-essen rickard-von-essen changed the title WIP: Initial FreeBSD 11.0 support Initial FreeBSD 11.0 support Oct 11, 2016
@rickard-von-essen
Copy link
Collaborator Author

Updated to FreeBSD 11.0 RELEASE

rickard-von-essen
rickard-von-essen commented Oct 11, 2016
View reviewed changes
scripts/freebsd/update.sh
@@ -19,7 +19,7 @@ fi

# Update FreeBSD
# NOTE: the install action fails if there are no updates so || true it
env PAGER=/bin/cat $freebsd_update fetch;
env PAGER=/bin/cat $freebsd_update fetch || true;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

11.0 fails on fetch. I guess it's because there is no mirrors yet. Didn't have time to dig into it.

rickard-von-essen
rickard-von-essen commented Oct 11, 2016
View reviewed changes
scripts/freebsd/vmtools.sh
@@ -44,7 +44,7 @@ vmware-iso|vmware-vmx)
mdconfig -a -t vnode -f $HOME_DIR/freebsd.iso -u 0;
mount -t cd9660 /dev/md0 /tmp/vmfusion;
tar xzf /tmp/vmfusion/vmware-freebsd-tools.tar.gz -C /tmp/vmfusion-archive;
/tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --force-install;
/tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I tested on VMware Fusion 7.1.3 and had to change this. I don't know what's the correct arg in Fusion 8.

Copy link
Contributor

Choose a reason for hiding this comment

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

Probably need to add a check here like we have in other scripts for the vmware version and set the option as appropriate.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Agree

Copy link
Contributor

Choose a reason for hiding this comment

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

Here are some easy lines to copy/pasta - https://github.com/chef/bento/blob/master/scripts/common/vmware.sh#L18-L23

@rickard-von-essen rickard-von-essen changed the title Initial FreeBSD 11.0 support FreeBSD 11.0 support Oct 15, 2016
@rickard-von-essen rickard-von-essen mentioned this pull request Oct 15, 2016
Closed
@rickard-von-essen
Copy link
Collaborator Author

Fixed support for both VMware Fusion 7 and 8 (+).

@cheeseplus
Copy link
Contributor

I know this started before we implemented DCO (as you can see from the bot) but if you could repush with signed commits (--signoff via git) then I can get this merged. Or I can do it myself and credit you. Either way, let me know and we'll get this merged!

@rickard-von-essen
Initial FreeBSD 11.0 support
91f7714 
Changes compared with 10.2:
1) http/freebsd-11.0/install.sh start start and size have been adjusted
  to work:
  < gpart add -b 34 -s 94 -t freebsd-boot $DISKSLICE
  ---
  > gpart add -b 40 -s 88 -t freebsd-boot $DISKSLICE

2) scripts/freebsd/update.sh temporarly skip freebsd update/install for
  11.0 since no updates exists and trying to run the command fails, see
  the NOTE in the script. pkg is automatically installed on "pkg update"
  at the end of the script.

Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
@rickard-von-essen
FreeBSD 11.0: Updated to BETA2 and switched to bsdinstaller.
54d4788 
Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
@rickard-von-essen
FreeBSD 11.0: Updated to BETA3 and fixed the minimize script.
4814562 
Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
@rickard-von-essen
Updated to FreeBSD 11.0 RELEASE
f9428eb 
Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
@rickard-von-essen
Handle changed options for VMware Tools install
c91f28a 
Signed-off-by: Rickard von Essen <rickard.von.essen@gmail.com>
@rickard-von-essen
Copy link
Collaborator Author

Fixed the DCO.

@cheeseplus
Copy link
Contributor

lgtm

@cheeseplus cheeseplus merged commit a87695f into chef:master Nov 18, 2016
@rickard-von-essen rickard-von-essen deleted the freebsd-11 branch November 19, 2016 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cheeseplus cheeseplus cheeseplus 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.
4 participants
@rickard-von-essen @cheeseplus @rosstimson @tas50