Merge pull request #609 from jvonau/Feb26

liveiso - more notes and switch to release-6.0 for production

installer/livecd/Fedora-22/ks.cfg

@@ -36,21 +36,22 @@ mkdir -p /opt/schoolserver
 cd /opt/schoolserver
 
 ### release flow
-#git clone --depth 1 --branch stable https://github.com/XSCE/xsce 
-#cd xsce
-#git branch <ver> 
-#git checkout <ver> 
-#git pull origin <ver>
-
-### custom testing branch
-git clone --depth 1 --branch master https://github.com/XSCE/xsce 
+git clone --depth 1 --branch release-6.0 https://github.com/XSCE/xsce 
 cd xsce
+
+# pre-seed master so the same commit hash is in both branches for a common 
+# starting point
+git checkout -b master
+
+# run the install in different branch
 git checkout -b installer
 
 ## set preload time options here
 
-# Don't start services while in the chroot
+# Don't start services while in the chroot 'installing'
+# this controls what is on the image, by default everything.
 # turn on and off what you want to preload for other than default
+# toggle to False what is to be excluded from the image.
 cat > /opt/schoolserver/xsce/vars/local_vars.yml << EOF
 installing: True
 
@@ -92,7 +93,8 @@ EOF
 
 ./runtags download,download2 | tee -a xsce-image.log
 
-## set install time options here
+## set install time options here for installed services from above.
+# enable or disable installed services here.
 
 # Don't start services while in the chroot
 cat > /opt/schoolserver/xsce/vars/local_vars.yml << EOF
@@ -105,8 +107,8 @@ EOF
 # get rid of custom local_vars
 git reset --hard 
 
-# create the release branch
-git checkout -b release-6.0
+# switch back to the release branch
+git checkout release-6.0
 
 #disable updates-testing
 sed -i 's|enabled=1|enabled=0|' /etc/yum.repos.d/fedora-updates-testing.repo