View | Details | Raw Unified | Return to bug 28553
Collapse All | Expand All

(-)a/conf.d/vm.mk (+3 lines)
Lines 22-25 vm/icewm-setup: vm/.desktop-bare mixin/icewm use/oem use/x11-autostart Link Here
22 
	@$(call add,THE_BRANDING,graphics)
 22 
	@$(call add,THE_BRANDING,graphics)
23 
	@$(call add,THE_LISTS,$(call tags,base l10n))
 23 
	@$(call add,THE_LISTS,$(call tags,base l10n))
24 

          24
          

        

            

              
              
              25
              
vm/vagrant-base: vm/net use/vagrant

            

            

              26
              
	@$(call set,KFLAVOURS,led-ws)

            

            

              27
              

            

        

          25
          
endif

          28
          
endif

        



(-)a/features.in/vagrant/authorized_keys
      (+1 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key

            



(-)a/features.in/vagrant/config.mk
      (+3 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
use/vagrant: use/vmguest/vbox use/deflogin use/net-ssh

            

            

              2
              
	@$(call add_feature)

            

            

              3
              
	@$(call add,USERS,vagrant:vagrant:1:1)

            



(-)a/features.in/vagrant/rootfs/image-scripts.d/50-vagrant
      (+16 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
#!/bin/sh

            

            

              2
              
# NB: 50-vargant > 50-users

            

            

              3
              

            

            

              4
              
# https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub

            

            

              5
              
pubkey="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key"

            

            

              6
              
sshkeys=~vagrant/.ssh/authorized_keys

            

            

              7
              
install -pDm400 -o vagrant -g vagrant /dev/null "$sshkeys"

            

            

              8
              
echo "$pubkey" > "$sshkeys"

            

            

              9
              

            

            

              10
              
### FIXME: check if this works

            

            

              11
              
sudocfg=/etc/sudoers.d/vagrant

            

            

              12
              
install -pDm400 /dev/null "$sudocfg"

            

            

              13
              
cat > "$sudocfg" << EOF

            

            

              14
              
Defaults:vagrant  !requiretty

            

            

              15
              
vagrant ALL=(ALL) NOPASSWD:ALL

            

            

              16
              
EOF

            






  

  Return to bug 28553