Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F147988717
D52456.1785021068.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D52456.1785021068.diff
View Options
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -47,19 +47,22 @@
-c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh'
# Change root's password to vagrant
- echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} \
- usermod root -h 0
+ echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} usermod root -h 0
# Configure sudo to allow the vagrant user
echo 'vagrant ALL=(ALL:ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers
# Configure the vagrant ssh keys
mkdir ${DESTDIR}/home/vagrant/.ssh
- chmod 700 ${DESTDIR}/home/vagrant/.ssh
+
echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys
echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1YdxBpNlzxDqfJyw/QKow1F+wvG9hXGoqiysfJOn5Y vagrant insecure public key" >> ${DESTDIR}/home/vagrant/.ssh/authorized_keys
- chown -R 1001 ${DESTDIR}/home/vagrant/.ssh
chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys
+ metalog_add_data ./home/vagrant/.ssh/authorized_keys 0600
+
+ chmod 700 ${DESTDIR}/home/vagrant/.ssh
+ chown -R 1001 ${DESTDIR}/home/vagrant/.ssh
+ echo "./home/vagrant/.ssh type=dir uid=1001 gid=1001 mode=0700" >> METALOG
# Reboot quickly, Don't wait at the panic screen
echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf
@@ -68,6 +71,7 @@
# The console is not interactive, so we might as well boot quickly.
echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
+ metalog_add_data ./boot/loader.conf
# The first time the VM boots, the installed "first boot" scripts
# should be allowed to run:
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Jul 25, 11:11 PM (2 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29261651
Default Alt Text
D52456.1785021068.diff (1 KB)
Attached To
Mode
D52456: release: Prepare Vagrant cloudware images for building as non-root
Attached
Detach File
Event Timeline
Log In to Comment