Commits

Eric Dowd  committed 898e77f

Updated README

  • Participants
  • Parent commits eb16572

Comments (0)

Files changed (1)

 
 * region defaults to `us-east-1`
 * security group defaults to `gentoo-bootstrap` and it will be created if needed
-* key pair defaults to `gentoo-bootstrap_$region` e.g. `gentoo-bootstrap_us-east-1`
-* key file defaults to `gentoo-bootstrap_$region.pem` e.g. `gentoo-bootstrap_us-east-1.pem`
+* key pair defaults to "gentoo-bootstrap\_`$region`-`date +%Y%m%d%H%M%S`" e.g. `gentoo-bootstrap_us-east-1-20130310014923`
+* key file defaults to "gentoo-bootstrap\_`$region`-`date +%Y%m%d%H%M%S`.pem" e.g. `gentoo-bootstrap_us-east-1-20130310014923.pem`
 * The key pair will be created if needed.
 
 Sample command to setup us-east-1
 
 ## build_gentoo.sh
 
-Builds 64 bit Gentoo image. Will use a c1.medium for bootstrap instance.
+The pain of keeping the 32 and 64 bit versions in sync finally outweight the pain of merging the two scripts together. This and `remote_gentoo.sh` (as opposed to `i386/remote_gentoo.sh` and `x86_64/remote_gentoo.sh`) are the result of that.
+
+Builds Gentoo image for architecture given. Will use a c1.medium for bootstrap instance.
 
 Will use a t1.micro as test instance.
 
 
 * architecture is not optional. The script will give an error. Valid values are: `i386`, `x86_64`
 * region defaults to `us-east-1`
-* security group default to `gentoo-bootstrap_64-bit` and will be created if needed
-* key pair defaults to `gentoo-bootstrap_64-bit_$region` e.g. `gentoo-bootstrap_64-bit_us-east-1`
-* key file defaults to `gentoo-bootstrap_64-bit_$region.pem` e.g. `gentoo-bootstrap_64-bit_us-east-1.pem`
+* security group defaults to `gentoo-bootstrap` and it will be created if needed
+* key pair defaults to "gentoo-bootstrap\_`$region`-`date +%Y%m%d%H%M%S`" e.g. `gentoo-bootstrap_us-east-1-20130310014923`
+* key file defaults to "gentoo-bootstrap\_`$region`-`date +%Y%m%d%H%M%S`.pem" e.g. `gentoo-bootstrap_us-east-1-20130310014923.pem`
 * key pair will be created if needed.
 
-Default AMI name is Gentoo\_64-bit-EBS-`date +%Y-%m-%d-%H-%M-%S`, but can be changed if the environment variable `AMI_NAME` is set.
+Default AMI name is Gentoo\_64-bit-EBS-`date +%Y-%m-%d-%H-%M-%S` if architecture is `x86_64` and is Gentoo\_32-bit-EBS-`date +%Y-%m-%d-%H-%M-%S` if architecture is `i386`, but can be changed if the environment variable `AMI_NAME` is set.
+
+Sample command for building 64 bit gentoo on us-east-1, using all defaults
+
+```bash
+./build_gentoo.sh x86_64
+```
 
 Sample command for building 64 bit gentoo on us-east-1
 
 
 ## build_gentoo_64.sh
 
-Builds 64 bit Gentoo image. Will use a c1.medium for bootstrap instance.
-
-Will use a t1.micro as test instance.
+Wrapper for `build_gentoo.sh`, builds the regular 64-bit Gentoo image.
 
 Because sudo will be called, this script cannot be run in the backgroud.
 
 Recommend running screen before running.
 
-Takes 4 options:
+Architecture is set for you, but the other 4 options remain:
 
 1. region 
 2. security group
 3. key pair
 4. keyfile
 
-if you do not set these:
-
-* region defaults to `us-east-1`
-* security group default to `gentoo-bootstrap` and will be created if needed
-* key pair defaults to `gentoo-bootstrap_$region` e.g. `gentoo-bootstrap_us-east-1`
-* key file defaults to `gentoo-bootstrap_$region.pem` e.g. `gentoo-bootstrap_us-east-1.pem`
-* key pair will be created if needed.
-
-Default AMI name is Gentoo\_64-bit-EBS-`date +%Y-%m-%d-%H-%M-%S`, but can be changed if the environment variable `AMI_NAME` is set.
-
 Sample command for building 64 bit gentoo on us-east-1
 
 ```bash
 
 ## build_gentoo_32.sh
 
-Builds 32 bit Gentoo image. Will use a c1.medium for bootstrap instance.
-
-Will use a t1.micro as test instance.
+Wrapper for `build_gentoo.sh`, builds the regular 32-bit Gentoo image.
 
 Because sudo will be called, this script cannot be run in the backgroud.
 
 Recommend running screen before running.
 
-Takes 4 options:
+Architecture is set for you, but the other 4 options remain:
 
 1. region 
 2. security group
 3. key pair
 4. keyfile
 
-if you do not set these:
-
-* region defaults to `us-east-1`
-* security group default to `gentoo-bootstrap` and will be created if needed
-* key pair defaults to `gentoo-bootstrap_$region` e.g. `gentoo-bootstrap_us-east-1`
-* key file defaults to `gentoo-bootstrap_$region.pem` e.g. `gentoo-bootstrap_us-east-1.pem`
-* key pair will be created if needed.
-
-Default AMI name is Gentoo\_32-bit-EBS-`date +%Y-%m-%d-%H-%M-%S`, but can be changed if the environment variable `AMI_NAME` is set.
-
 Sample command for building 32 bit gentoo on us-east-1
 
 ```bash
 
 ## build_minimal_gentoo_64.sh
 
-Builds a minimal 64 bit Gentoo image. Will use a c1.medium for bootstrap instance.
-
-Will use a t1.micro as test instance.
+Wrapper for `build_gentoo.sh`, builds the minimal 64-bit Gentoo image. See the AMI_TYPE for more about minimal build.
 
 Because sudo will be called, this script cannot be run in the backgroud.
 
 Recommend running screen before running.
 
-Takes 4 options:
+Architecture is set for you, but the other 4 options remain:
 
 1. region 
 2. security group
 3. key pair
 4. keyfile
 
-if you do not set these:
-
-* region defaults to `us-east-1`
-* security group default to `gentoo-bootstrap` and will be created if needed
-* key pair defaults to `gentoo-bootstrap_$region` e.g. `gentoo-bootstrap_us-east-1`
-* key file defaults to `gentoo-bootstrap_$region.pem` e.g. `gentoo-bootstrap_us-east-1.pem`
-* key pair will be created if needed.
-
 Default AMI name is minimal-Gentoo\_64-bit-EBS-`date +%Y-%m-%d-%H-%M-%S`, but can be changed if the environment variable `AMI_NAME` is set.
 
 Sample command for building 64 bit gentoo on us-east-1
 
 ```bash
-./build_minimal_gentoo_64.sh us-east-1 gentoo-bootstrap gentoo-bootstrap_us-east-1 gentoo-bootstrap_us-east-1.pem
+./build_minimal_gentoo_64.sh
 ```
 
 See the AMI_TYPE section below for more information on this AMI.
 
 ## build_minimal_gentoo_32.sh
 
-Builds minimal 32 bit Gentoo image. Will use a c1.medium for bootstrap instance.
-
-Will use a t1.micro as test instance.
+Wrapper for `build_gentoo.sh`, builds the minimal 64-bit Gentoo image. See the AMI_TYPE for more about minimal build.
 
 Because sudo will be called, this script cannot be run in the backgroud.
 
 Recommend running screen before running.
 
-Takes 4 options:
+Architecture is set for you, but the other 4 options remain:
 
 1. region 
 2. security group
 3. key pair
 4. keyfile
 
-if you do not set these:
-
-* region defaults to `us-east-1`
-* security group default to `gentoo-bootstrap` and will be created if needed
-* key pair defaults to `gentoo-bootstrap_$region` e.g. `gentoo-bootstrap_us-east-1`
-* key file defaults to `gentoo-bootstrap_$region.pem` e.g. `gentoo-bootstrap_us-east-1.pem`
-* key pair will be created if needed.
-
 Default AMI name is minimal-Gentoo\_32-bit-EBS-`date +%Y-%m-%d-%H-%M-%S`, but can be changed if the environment variable `AMI_NAME` is set.
 
 Sample command for building 32 bit gentoo on us-east-1
 
 ```bash
-./build_minimal_gentoo_32.sh us-east-1 gentoo-bootstrap gentoo-bootstrap_us-east-1 gentoo-bootstrap_us-east-1.pem
+./build_minimal_gentoo_32.sh
 ```
 
-See the AMI_TYPE section below for more information on this AMI.
-
 ## remote_gentoo.sh
 
 The script to copied to and executed on bootstrap instance.