From 85672d5a06243c842b0c600783d80b126030153d Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Wed, 31 Dec 2014 15:40:37 -0500 Subject: [PATCH 1/2] adding .gitignore --- .gitignore | 17 ++++++++ http/slackware64-14.1/install.sh | 2 + scripts/slackware/postinstall.sh | 17 ++++---- slackware64-14.1.json | 72 ++------------------------------ 4 files changed, 32 insertions(+), 76 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a357d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +.vagrant +Berksfile.lock +Gemfile.lock +*~ +*# +.#* +\#*# +.*.sw[a-z] +*.un~ +.bundle +.cache +.kitchen +bin +.kitchen.local.yml +.coverage +tmp +packer_cache \ No newline at end of file diff --git a/http/slackware64-14.1/install.sh b/http/slackware64-14.1/install.sh index 72643a2..4741849 100755 --- a/http/slackware64-14.1/install.sh +++ b/http/slackware64-14.1/install.sh @@ -89,6 +89,7 @@ a/which \ a/xfsprogs \ a/xz \ ap/nano \ +ap/sudo \ ap/slackpkg \ n/curl \ n/dhcpcd \ @@ -210,6 +211,7 @@ $ROOT/sbin/lilo -r $ROOT -C /etc/lilo.conf # add vagrant user $ROOT/usr/sbin/useradd -R $ROOT -d /home/vagrant -m -G wheel -c "Vagrant User" -r vagrant echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> $ROOT/etc/sudoers +sed -i "s/^.*requiretty/#Defaults requiretty/" $ROOT/etc/sudoers # set root and vagrant password echo "root:vagrant" | $ROOT/usr/sbin/chpasswd -R $ROOT diff --git a/scripts/slackware/postinstall.sh b/scripts/slackware/postinstall.sh index 8ceff16..bc3f21b 100644 --- a/scripts/slackware/postinstall.sh +++ b/scripts/slackware/postinstall.sh @@ -1,16 +1,17 @@ #!/bin/sh -x # set the time -ntpdate -v -b in.pool.ntp.org -date > /etc/vagrant_box_build_time +# ntpdate -v -b in.pool.ntp.org +# date > /etc/vagrant_box_build_time # install vagrant keys -mkdir /home/vagrant/.ssh -chmod 700 /home/vagrant/.ssh -cd /home/vagrant/.ssh -wget -O authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh +# mkdir /home/vagrant/.ssh +# chmod 700 /home/vagrant/.ssh +# cd /home/vagrant/.ssh +# wget -O authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' +# chown -R vagrant /home/vagrant/.ssh +# chmod -R go-rwsx /home/vagrant/.ssh + # As sharedfolders are not in defaults ports tree # We will use vagrant via NFS diff --git a/slackware64-14.1.json b/slackware64-14.1.json index fc76c74..883af2d 100644 --- a/slackware64-14.1.json +++ b/slackware64-14.1.json @@ -17,10 +17,10 @@ { "type": "virtualbox-iso", "boot_command": [ - "", - "", - "dhcpcd eth0", - "wget -O /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/slackware64-14.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" + "", + "", + "dhcpcd eth0", + "wget -O /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/slackware64-14.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], "boot_wait": "2m22s", "disk_size": 10140, @@ -42,75 +42,11 @@ [ "modifyvm", "{{.Name}}", "--memory", "512" ], [ "modifyvm", "{{.Name}}", "--cpus", "1" ] ] - }, - { - "type": "vmware-iso", - "boot_command": [ - "", - "", - "dhcpcd eth0", - "wget -O /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/slackware64-14.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], - "boot_wait": "2m22s", - "disk_size": 10140, - "guest_os_type": "linux", - "http_directory": "http", - "iso_checksum": "d00807a86fad75bc90adf72c52c561202591d6ef", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "vm_name": "packer-slackware64-14.1", - "output_directory": "packer-slackware64-14.1-vmware", - "tools_upload_flavor": "linux", - "vmx_data": { - "memsize": "512", - "numvcpus": "1", - "cpuid.coresPerSocket": "1" - } - }, - { - "type": "parallels-iso", - "boot_command": [ - "", - "", - "dhcpcd eth0", - "wget -O /tmp/install.sh http://{{ .HTTPIP }}:{{ .HTTPPort }}/slackware64-14.1/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh {{ .Name }}" ], - "boot_wait": "2m22s", - "disk_size": 10140, - "guest_os_type": "linux", - "http_directory": "http", - "iso_checksum": "d00807a86fad75bc90adf72c52c561202591d6ef", - "iso_checksum_type": "sha1", - "iso_url": "{{user `mirror`}}/slackware64-14.1-iso/slackware64-14.1-install-dvd.iso", - "ssh_username": "vagrant", - "ssh_password": "vagrant", - "ssh_port": 22, - "ssh_wait_timeout": "10000s", - "shutdown_command": "echo 'shutdown -p now' > shutdown.sh; cat 'shutdown.sh' | su -", - "parallels_tools_mode": "disable", - "prlctl_version_file": ".prlctl_version", - "vm_name": "packer-slackware64-14.1", - "output_directory": "packer-slackware64-14.1-parallels", - "prlctl": [ - [ "set", "{{.Name}}", "--memsize", "512" ], - [ "set", "{{.Name}}", "--cpus", "1" ], - [ "set", "{{.Name}}", "--device-set", "cdrom0", "--iface", "ide" ], - [ "set", "{{.Name}}", "--device-del", "fdd0" ], - [ "set", "{{.Name}}", "--device-del", "parallel0" ] - ] } ], "post-processors": [ { "output": "../builds/{{.Provider}}/opscode_slackware64-14.1_chef-{{user `chef_version`}}.box", - "override": { - "parallels": { - "vagrantfile_template": "vagrantfile_templates/parallels/freebsd.rb" - } - }, "type": "vagrant" } ] From 2ea7e8402645ff3e2b98fd372e631eca26d8b993 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Wed, 31 Dec 2014 15:41:13 -0500 Subject: [PATCH 2/2] adding to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a357d4..2441f92 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ bin .kitchen.local.yml .coverage tmp -packer_cache \ No newline at end of file +packer_cache +packer-slackware64-14.1-virtualbox