X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=fba7bb60bbb257e76ddecb6db13a1fad9a3b4186;hb=f8c8e666cc22c5cc3a18311ee8f534becfa23ca7;hp=dfc656ae333fd5b2f1de3f48c1cf708d5e978099;hpb=ddccfd5fd9f54b9b29382a72d9334e8c35698b3f;p=feisty_meow.git

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index dfc656ae..fba7bb60 100644
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -235,7 +235,7 @@ fi
 
 ##############
 
-# fix samba configuration for (ass-headed) default of read-only in user homes.
+# fix samba configuration for screwy default of read-only in user homes.
 # why cripple a necessary feature by default?
 
 sep
@@ -247,9 +247,10 @@ replacement="read only = no"
 # was actually already in the file...  too much subtlety can get one into trouble.
 sed -i "0,/$pattern/{s/$pattern/$replacement/}" /etc/samba/smb.conf
 test_or_die "patching samba configuration to enable write acccess on user home dirs"
+echo successfully patched the samba configuration to enable writes on user home directories. 
+
 # sweet, looks like that worked...
 restart_samba
-echo successfully patched the samba configuration to enable writes on user home directories. 
 
 ##############
 
@@ -277,47 +278,52 @@ echo Successfully configured the apache2 environment variables needed for cakela
 
 sep
 
-echo "Checking existing swap partition configuration.
+# we will only add swap now if explicitly asked for it.  this is to avoid creating
+# a swap file where the vm is running on an SSD, since that can use up the SSD's lifespan
+# too quickly.
+if [ ! -z "$ADD_SWAP" ]; then
+  echo "Checking existing swap partition configuration.
 "
 
-# check for existing swap.
-free | grep -q "Swap:[[:blank:]]*[1-9][0-9]"
-if [ $? -ne 0 ]; then
-  # no swap in current session, so add it.
-  echo "Enabling ramdisk swap partition...
+  # check for existing swap.
+  free | grep -q "Swap:[[:blank:]]*[1-9][0-9]"
+  if [ $? -ne 0 ]; then
+    # no swap in current session, so add it.
+    echo "Enabling ramdisk swap partition...
 "
-  add_swap_mount
-  echo "
+    add_swap_mount
+    echo "
 Enabled ramdisk swap partition for current boot session."
-fi
+  fi
 
-# the above just gives this session a swap partition, but we want to have
-# the vm boot with one also.
+  # the above just gives this session a swap partition, but we want to have
+  # the vm boot with one also.
 
-# check if there is already swap mentioned in the root crontab.  we will get root's
-# crontab below since this script has to run as sudo.
-crontab -l | grep -iq add_swap_mount
-if [ $? -ne 0 ]; then
-  # no existing swap setup in crontab, so add it.
-  echo "
+  # check if there is already swap mentioned in the root crontab.  we will get root's
+  # crontab below since this script has to run as sudo.
+  crontab -l | grep -iq add_swap_mount
+  if [ $? -ne 0 ]; then
+    # no existing swap setup in crontab, so add it.
+    echo "
 Adding a boot-time ramdisk swap partition...
 "
-  # need to do it carefully, since sed won't add lines to a null file.  we thus
-  # create a temporary file to do our work in and ignore sed as a tool for this.
-  tmpfile="$(mktemp junk.XXXXXX)"
-  crontab -l 2>/dev/null >"$tmpfile"
-  echo "
+    # need to do it carefully, since sed won't add lines to a null file.  we thus
+    # create a temporary file to do our work in and ignore sed as a tool for this.
+    tmpfile="$(mktemp junk.XXXXXX)"
+    crontab -l 2>/dev/null >"$tmpfile"
+    echo "
 # need to explicitly set any variables we will use.
 FEISTY_MEOW_APEX=${FEISTY_MEOW_APEX}
 # add swap space to increase memory available.
 @reboot bash $FEISTY_MEOW_APEX/scripts/system/add_swap_mount.sh
 " >>"$tmpfile"
-  # now install our new version of the crontab.
-  crontab "$tmpfile"
-  rm "$tmpfile"
+    # now install our new version of the crontab.
+    crontab "$tmpfile"
+    rm "$tmpfile"
 
-  echo "
+    echo "
 Added boot-time ramdisk swap partition to crontab for root."
+  fi
 fi
 
 ##############