Call xpg4/bin/id on Solaris [GH-679]

master
Mitchell Hashimoto 2012-01-26 09:56:06 -08:00
parent 20fa355502
commit 5500058343
2 changed files with 7 additions and 2 deletions

View File

@ -12,6 +12,7 @@
they are properly detected. [GH-683]
- Fix issue where VM import sometimes made strange VirtualBox folder
layouts. [GH-669]
- Call proper `id` command on Solaris. [GH-679]
## 0.9.3 (January 24, 2012)

View File

@ -101,13 +101,17 @@ module Vagrant
# Create the shared folder
vm.channel.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
# We have to use this `id` command instead of `/usr/bin/id` since this
# one accepts the "-u" and "-g" flags.
id_cmd = "/usr/xpg4/bin/id"
# Mount the folder with the proper owner/group
mount_options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
mount_options = "-o uid=`#{id_cmd} -u #{owner}`,gid=`#{id_cmd} -g #{group}`"
mount_options += ",#{options[:extra]}" if options[:extra]
vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
# chown the folder to the proper owner/group
vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `#{id_cmd} -u #{owner}`:`#{id_cmd} -g #{group}` #{guestpath}")
end
end
end