Skip to content

Commit

Permalink
Fix offset mount and and add sizelimit to work with iamge 2017-06-21
Browse files Browse the repository at this point in the history
  • Loading branch information
guysoft committed Jun 24, 2017
1 parent 00340c9 commit 2dfb18e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function mount_image() {

# mount root and boot partition
sudo mount -o loop,offset=$root_offset $image_path $mount_path/
sudo mount -o loop,offset=$boot_offset $image_path $mount_path/boot
sudo mount -o loop,offset=$boot_offset,sizelimit=$( expr $root_offset - $boot_offset ) $image_path $mount_path/boot
sudo mount -o bind /dev/pts $mount_path/dev/pts
}

Expand Down
9 changes: 8 additions & 1 deletion src/vagrant/Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
Vagrant.configure("2") do |o|
# o.vm.box = "fullpageos-build"
o.vm.box= "https://github.com/kraksoft/vagrant-box-ubuntu/releases/download/15.04/ubuntu-15.04-amd64.box"
#o.vm.box= "https://github.com/kraksoft/vagrant-box-ubuntu/releases/download/15.04/ubuntu-15.04-amd64.box"
o.vm.box= "ubuntu/zesty64"
o.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
o.vm.synced_folder "../../", "/FullPageOS", create:true, type: "nfs"
o.vm.network :private_network, ip: "192.168.55.55"
o.vm.provision :shell, :path => "setup.sh", args: ENV['SHELL_ARGS']

o.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
v.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
end


end

0 comments on commit 2dfb18e

Please sign in to comment.