Browse files

Clean up solaris template a tad to make it read a little better. Also…

… fixed up an echo in postinstall.sh; someones ruby spilled over into their bash ;).
  • Loading branch information...
1 parent 4f2b78d commit 5f27741ce7c55a69d92271ecc4e3861ff8be7667 @benjaminws benjaminws committed Jun 25, 2011
View
15 templates/solaris-11-express-i386/definition.rb
@@ -15,22 +15,18 @@
:boot_wait => "10", :boot_cmd_sequence => [
'e',
'e',
- '<Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace>',
- '<Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace><Backspace>',
+ '<Backspace>'*22,
'false',
#',aimanifest=prompt',
#',aimanifest=http://%IP%:%PORT%/default.xml',
'<Enter>',
'b',
- '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
- '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
- '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
- '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
+ '<Wait>'*75,
# login as root
'root<Enter><Wait>',
'solaris<Enter><Wait>',
-
+
# Background check when install is complete, add vagrant to the sudo
'while (true); do sleep 5; test -f /a/etc/sudoers && grep -v "vagrant" "/a/etc/sudoers" 2> /dev/null',
' && echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /a/etc/sudoers && break ; done &<Enter>',
@@ -39,17 +35,16 @@
'<Enter>while (true); do grep "You may wish to reboot" "/tmp/install_log" 2> /dev/null',
' && reboot; sleep 10; done &<Enter>',
-
# Wait for 5 seconds, so the webserver will be up
'sleep 5; curl http://%IP%:%PORT%/default.xml -o default.xml;',
'cp default.xml /tmp/ai_combined_manifest.xml;',
# Start the installer
'svcadm enable svc:/application/auto-installer:default;',
-
+
# Wait for the installer to launch and display the logfile
'sleep 3; tail -f /tmp/install_log<Enter>'
-
+
],
:kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "default.xml",
:ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
View
4 templates/solaris-11-express-i386/postinstall.sh
@@ -69,7 +69,7 @@ yes|/usr/sbin/pkgadd -d . SUNWvbox
echo "export PATH=/opt/csw/bin:/opt/csw/sbin:$PATH" >> /root/.profile
echo "export PATH=/opt/csw/bin:/opt/csw/sbin:$PATH" >> /export/home/vagrant/.profile
-puts "Note: validation of this box wil fail, as it's not linux based, working on that"
+echo "Note: validation of this box wil fail, as it's not linux based, working on that"
exit
@@ -93,4 +93,4 @@ bash-3.00# cd ruby-enterprise-1.8.6-20080507/source
bash-3.00# ./configure --with-openssl-dir=/opt/csw --with-readline-dir=/opt/csw \
--with-iconv-dir=/opt/csw --prefix=/opt/rubyenterprise
bash-3.00# make
-bash-3.00# make install
+bash-3.00# make install

0 comments on commit 5f27741

Please sign in to comment.