') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Fix issues related to upgrading to Virtualbox 5 by nathanleclaire · Pull Request #375 · boot2docker/boot2docker-cli · GitHub
Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Fix issues related to upgrading to Virtualbox 5 - #375

Merged
tianon merged 1 commit into
boot2docker:masterfrom
nathanleclaire:vbox5
Jul 14, 2015
Merged

Fix issues related to upgrading to Virtualbox 5#375
tianon merged 1 commit into
boot2docker:masterfrom
nathanleclaire:vbox5

Conversation

@nathanleclaire

@nathanleclairenathanleclaire commented Jul 14, 2015

Copy link
Copy Markdown
Contributor

cc @tianon

This seems to fix the issues seen related to using boot2docker-cli with Virtualbox 5, the latest release.

I have tested this patch in the following situations and creating, starting/stopping, day-to-day Docker operations etc. seem to be working normally with the 1.7.1rc3 ISO provided at https://github.com/tianon/boot2docker:

  1. On OSX, with Virtualbox 5
  2. On Debian (Jessie) Linux, using Virtualbox 4.3.18
  3. On Windows, using Virtualbox 4.* (not sure which actually), and then again with Virtualbox 5

Cheers to @hheimbuerger for taking the initiative on a similar patch, I essentially consider this a carrying of his original patch.

Signed-off-by: Nathan LeClaire nathan.leclaire@gmail.com

Closes#373
Fixes#374
Fixesboot2docker/boot2docker#979

@nathanleclaire
Fix issues related to upgrading to Virtualbox 5
849a4d3
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
@tianon

tianon commented Jul 14, 2015

Copy link
Copy Markdown
Contributor

🤘 LGTM

Thanks @hheimbuerger for getting us started and thanks @nathanleclaire for carrying us over the finish line. Let's get us a 1.7.1 release! 👍

tianon added a commit that referenced this pull request Jul 14, 2015
@tianon
Merge pull request#375from nathanleclaire/vbox5
5f3f155
Fix issues related to upgrading to Virtualbox 5
@tianon
tianon merged commit 5f3f155 into boot2docker:masterJul 14, 2015
@nathanleclaire

nathanleclaire commented Jul 14, 2015

Copy link
Copy Markdown
ContributorAuthor

👍 👍 👍

@hheimbuerger

hheimbuerger commented Jul 15, 2015

Copy link
Copy Markdown

This change means that AddNATPF() (now modifyvm, working on stopped VMs) and DelNATPF() (still controlvm, working on running VMs) are now behaving differently. Was that intentional?

@nathanleclaire

nathanleclaire commented Jul 15, 2015

Copy link
Copy Markdown
ContributorAuthor

@hheimbuerger It was not deliberate, although it doesn't seem like it will affect anything as DelNATPF is not invoked in the code anywhere that I can see. Would definitely appreciate a follow-up PR to make it consistent.

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

boot2docker init fails with VBoxManage synthcpu args on VirtualBox 5.0 Virtualbox 5.0 Compatibility - [Final version released]

3 participants

@nathanleclaire@tianon@hheimbuerger