From 503f3f38f673465a00d5ff3d2b5e507816f9f670 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Thu, 3 Mar 2011 20:31:36 -0800
Subject: [PATCH] vagrantized

---
 .gitignore                                |   6 +--
 Vagrantfile                               |  63 ++++++++++++++++++++++
 bochsrc => kernel/bochsrc                 |   0
 floppy.img => kernel/floppy.img           | Bin
 run_bochs.sh => kernel/run_bochs.sh       |   0
 {src => kernel/src}/Makefile              |   0
 kernel/src/boot.o                         | Bin 0 -> 624 bytes
 {src => kernel/src}/boot.s                |   0
 {src => kernel/src}/common.c              |   0
 {src => kernel/src}/common.h              |   0
 kernel/src/common.o                       | Bin 0 -> 787 bytes
 kernel/src/gdt.h                          |   0
 kernel/src/kernel                         | Bin 0 -> 13652 bytes
 {src => kernel/src}/link.ld               |   0
 {src => kernel/src}/main.c                |   0
 kernel/src/main.o                         | Bin 0 -> 1060 bytes
 {src => kernel/src}/monitor.c             |   0
 {src => kernel/src}/monitor.h             |   0
 kernel/src/monitor.o                      | Bin 0 -> 2440 bytes
 update_image.sh => kernel/update_image.sh |   0
 20 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 Vagrantfile
 rename bochsrc => kernel/bochsrc (100%)
 rename floppy.img => kernel/floppy.img (100%)
 rename run_bochs.sh => kernel/run_bochs.sh (100%)
 rename {src => kernel/src}/Makefile (100%)
 create mode 100644 kernel/src/boot.o
 rename {src => kernel/src}/boot.s (100%)
 rename {src => kernel/src}/common.c (100%)
 rename {src => kernel/src}/common.h (100%)
 create mode 100644 kernel/src/common.o
 create mode 100644 kernel/src/gdt.h
 create mode 100755 kernel/src/kernel
 rename {src => kernel/src}/link.ld (100%)
 rename {src => kernel/src}/main.c (100%)
 create mode 100644 kernel/src/main.o
 rename {src => kernel/src}/monitor.c (100%)
 rename {src => kernel/src}/monitor.h (100%)
 create mode 100644 kernel/src/monitor.o
 rename update_image.sh => kernel/update_image.sh (100%)

diff --git a/.gitignore b/.gitignore
index c2b9969..36454bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-src/*.o
-bochs.out
-src/kernel
+*.o
+kernel/bochs.out
+kernel/src/kernel
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..69b9471
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,63 @@
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "base"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host only network IP, allowing you to access it
+  # via the IP.
+  # config.vm.network "33.33.33.10"
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port "http", 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+  # Enable provisioning with chef solo, specifying a cookbooks path (relative
+  # to this Vagrantfile), and adding some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "cookbooks"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_server do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end
diff --git a/bochsrc b/kernel/bochsrc
similarity index 100%
rename from bochsrc
rename to kernel/bochsrc
diff --git a/floppy.img b/kernel/floppy.img
similarity index 100%
rename from floppy.img
rename to kernel/floppy.img
diff --git a/run_bochs.sh b/kernel/run_bochs.sh
similarity index 100%
rename from run_bochs.sh
rename to kernel/run_bochs.sh
diff --git a/src/Makefile b/kernel/src/Makefile
similarity index 100%
rename from src/Makefile
rename to kernel/src/Makefile
diff --git a/kernel/src/boot.o b/kernel/src/boot.o
new file mode 100644
index 0000000000000000000000000000000000000000..fa89888c25f33f3bba1a8583937c10d07fb88b75
GIT binary patch
literal 624
zcmaJ;K}y6x5Ufe!u7b#lg35YO1W|<G!3TKJld#~vAaMf<n+;^<peKET5AX|u&+s80
zguUoh#aNxpu(LVXFkMyMJ<Uw_{n^F2QVPx#Ld+EKV8uyYaDdKS76@LR`yq4RgUdJ9
z!^h#*`%hI>(_aRcc@&F#f)TJTxBzSlc7SccF0e-o7U^P>-5SJYHnvQg(j+NjeU~?Q
zZ6iQh6eiZl1#wl3GNf7~n~b1MQX1sR&4ex6=KnRqXXWQZM384V>rt;bL6m>2we&_y
z_o;VmOz!Wt@}B&c$~~F0vnP@xCp=sw_v>D%_r1KMTO@%K#1EcF8<YE7PqQbY%!uo$
d?Ueqop|zJ8h;eOLs#)X4gkv7pOZv$y{{WneF}45z

literal 0
HcmV?d00001

diff --git a/src/boot.s b/kernel/src/boot.s
similarity index 100%
rename from src/boot.s
rename to kernel/src/boot.s
diff --git a/src/common.c b/kernel/src/common.c
similarity index 100%
rename from src/common.c
rename to kernel/src/common.c
diff --git a/src/common.h b/kernel/src/common.h
similarity index 100%
rename from src/common.h
rename to kernel/src/common.h
diff --git a/kernel/src/common.o b/kernel/src/common.o
new file mode 100644
index 0000000000000000000000000000000000000000..5434839285f74795bb9114702a25a7dad46ce1a8
GIT binary patch
literal 787
zcma))ze~eV5XUdJYAQnf1rDOt$qM%2(1Pe#pIyW)i?}2;#Uf3>JW(eHmxeC>3H}4F
zcDGai5Vt4@4joGCUGokj2zqe&-1qLA_maoElShY!VE~5#8TeKJpL$Rlvj91m0y}!W
zkIlAiw&iR+vIi~Mw>tK~dY1k7UUxiQYD=>o$=K@1IC_a&a)i^-ufzHq8i!~c_PV%9
zwNly37Y;nP;rRKID2Z}$cPl9XM0nd&j*C>63D3Dw-i-or<|qe*8-^fiL9^-k*z*JB
ziR!Uk43$&6;2-@5SI|ReF{Qn91}C~EWOcoPBwt4B2Tcb1HnCx1{^i?753RR@NkQwa
zj;rKBGs?1N(gk?pLX$ic^O(FRY4S-bbg+*&!A;~Tibo`U^E4*?#~fx3GrisbeaqP6
z;PqHD)BP-bjJQwydFx20zl3ypN79q&*HLF-Mt9bb3wS~nl4?3T(u>G_%yq4Su1MgE
N8U$C$g@#Xg4PU}UVW|KB

literal 0
HcmV?d00001

diff --git a/kernel/src/gdt.h b/kernel/src/gdt.h
new file mode 100644
index 0000000..e69de29
diff --git a/kernel/src/kernel b/kernel/src/kernel
new file mode 100755
index 0000000000000000000000000000000000000000..6e0c68e18c6909dc1d4f74f2bfd4f197eefce979
GIT binary patch
literal 13652
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

literal 0
HcmV?d00001

diff --git a/src/link.ld b/kernel/src/link.ld
similarity index 100%
rename from src/link.ld
rename to kernel/src/link.ld
diff --git a/src/main.c b/kernel/src/main.c
similarity index 100%
rename from src/main.c
rename to kernel/src/main.c
diff --git a/kernel/src/main.o b/kernel/src/main.o
new file mode 100644
index 0000000000000000000000000000000000000000..d5b7d60b7beb1c8906e07446e7f79f9c0d4f57a1
GIT binary patch
literal 1060
zcma)4O-ox*5S^Dqo7N9f7u`r{go;s<i;D=cJ4ss$N}&svCA=gTeE2@#<wESL3qcV2
zFS@n+uDa<${1f7$g)W4)&}AXcx$llXv(bTh=bV|jlRK09@zu_2&+|ykqaxiXqJJ*Y
zv{<7lD%0-q&%+;o4lgUe{*OkZ)6#R~ESJE_c;NT9FXuM-73}Ogz0qNq)T_fJ4f_j3
zTkZCXYVD=&27X*^s-{|Rw3ahMqy`@%<98WNn&F<XRENsw14F9s8=q8nFd&sCndl`^
zq+`y-iP387?QUaW{NBEu<UXHgT!dXrx?=30?Kq(1_&no7#{ri`qLz!{JnG8qi|o*x
zwszo9K>Dq60QGm(t#J+d71&|uH)~n;K@NtyfTJFE#QxN>?1LP9(_t1R`YgmDYG9Aq
z<!;cZdk5l7>VR@Lq)u2|Fg{|(e3-Ywj@{+^ePZ#RV`9=zv|v77qQ4`F18=`#==?80
z%eJ#qMViPT=lp{)J!$WZV4Ho8H#U>2z#Mo7V$jPX7@;@D^!Avh$PZ%Gvp`W22PR27
zy-@q<wHl^@(bp>0!!U?%w9R(<np?QjS!7S!r-r>3c-i>>JRbK6GzW3-!W7XGaGI#@
KG~P{thr9v?YKZ*+

literal 0
HcmV?d00001

diff --git a/src/monitor.c b/kernel/src/monitor.c
similarity index 100%
rename from src/monitor.c
rename to kernel/src/monitor.c
diff --git a/src/monitor.h b/kernel/src/monitor.h
similarity index 100%
rename from src/monitor.h
rename to kernel/src/monitor.h
diff --git a/kernel/src/monitor.o b/kernel/src/monitor.o
new file mode 100644
index 0000000000000000000000000000000000000000..6a445a2b008a2b03b583f477a2b14a75cd665cb9
GIT binary patch
literal 2440
zcma)8T}&KR6uz@8cA?;aAwr`TnyhsjWrIo)8Z;*Dh$dDW8lsJ<bXkV5%CcmC_<5ip
z(-<b3`k>MHYW1NpO-y{)Hhmzw(D0)W(Q2Y;j19qrc8LYDX>GH*erM*~WowA>CU?I3
zopbKFALpK#WlVeZB}Gw$9EvCs+f0a0owldZ0*@#ayF`ciyRq(36UAgx6U*ju>bgV0
z!)Z?Et;w@aM~|u9o;%`pK8UzEr~AhuA=a|FTu!~H-R?=Pxzt3`gd47(q>IAU9m01A
zU6`?iRLp93RW+gAO<i{x^L04$9*bzL84S#6SyGwa{~1BNBdh#ywyMG=N3%xin6jYE
zs~1I&=`ggc^4@56Y?lzHzsJ6DEYdai?St@p+mYW<<ZrW98EROKC$70BwbfbemYCHx
zNY^dYMNM>U7%OVY@}#y2(<Y=s=hpb>sw-B@YR@F2RlGFTlyfBa#^-n-s3cY`JxP~w
z{ZHHZzU?fJmDmzQdI+(lu^OiNEq1c>33zKyACH$)YIgqD?J2lI#nduA>Qu)n{_?Go
zWpg?XZdUv&HPhDD2Or+~?6vm4bGfxEf8}yqrkYt4f-7NP+SZ(wAz}H7XRMo|bFGSJ
za5tI4iVHq!Ex4W5lTQMjMH(7Rs8dNp%P6MPZM9zBekK{aCdH)7(1LY1-0n`hu@P{?
z3OH`8yXUkGxHpjgQPNl+*EZrEu6<Mv^QxJ;nl^t{6XVq9I8UCH3T`-!V8&^TX2i&n
zamD@CNp4v*iK%6c(J~RMzC^EEdJjzKPW7v4as<m1IF+%RaV^Utn{hV!O{Cj#CbBC0
z=9I!_$u_lB<hTqf?!;Ej)a9kc#YJ=e&PwWL5x=2I(){KCUeO79sSAW!0?#kZ(BARg
zqT%Uho^3qX^jvex_R81g@78<ZZ##VWP@U(9-WBlm*EM<@y$9=?57-MKypfS$)Yk=!
zhHdPXtFYeZjq1Zu;qCTCeZt!ni3qPh6b$P9u=R(cy0`7Mj`~Q{=YN-U{LfK~I4a-+
z98ce=U+^)JgFj#55g1CO5%{u8h!?RDVC|<kT0hQQrl^2pFKlwid{4qa@iMLf4u=c^
z%D4usNgp8%ihImnT2J!PY+<yFcpQ}p*g!EfDlz4m#3}9-TJVr@goS!MD9|YwsRp|-
zDSZVd@xpwQ=&>o-<dFF!msn_bip`v~6W;#|LcH(<;!aBg#hRE7RG^yIA26qy)9XYU
z={M;qAZey{Ctf&;^0#kWi$t+F!~wLY67g-!Np~eO9Rt!@@)PVQpflgbtcLRm%!d&5
z4)_Zw=o>)d!@!Tho0!wb_*?LO%s&CHgVQ+_e;(Kh+0>uJF8~L?1I$G*)E|h3!d^dC
zgL<bw7LJ6%BH|B+`uaq#KHTZ=^@StemZlcbt@|ZwX%vHjZavf))Pte$h_JVH4$H-e
z2*sjZGI{4fESg{Y`*dG8&xXQ*sGev2`cPk>f16w0PN)zAp`m<~ZG{^A4b(>pep#&d
zu}p~P!5z53HyQgF4aP5k6rUhOL(VY%!B~O1lfRu1`A#zGj6;kQj2|(cWBig3`@d#P
z65^aW=D!jmZ!zwOu$-}qaWCV3Lgeu>o+3n^3HF<8zXWvPAD3&4E9~EcJ615=nB@PE
Muu6z&wlA^$AJug(<NyEw

literal 0
HcmV?d00001

diff --git a/update_image.sh b/kernel/update_image.sh
similarity index 100%
rename from update_image.sh
rename to kernel/update_image.sh