conf.base updates and memory limit tweaks.

Rename conf.base to conf.base-SoFS, since it is SoFS-specific.  Add
conf.base-SoFS-1.5.3 and modify setup_samba.sh to look for a
version-specific file if it exists.

Revert default value of MEM to 256MB and add 128MB to it in any
release files (SoFS-1.5.2, SoFS-1.5.3) that tell the kernel to reserve
128MB for kdump.  This introduces more order dependencies when using
release files... but there are obvious advantages.  Updated GUIMEM to
be a nice round 704MB and set it to 1GB in recent release files
(SoFS-1.5.2, SoFS-1.5.3) since it now seems much easier to run out of
memory.

Update note in README about configuration order being important when
using release files.  Add new file TODO.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/README b/README
index 1ecfaf16308726242ddc12883e280a7772205bc8..04b8329fa7686ae8f45188792f6f21253eac3e8d 100644 (file)
--- a/README
+++ b/README
@@ -168,7 +168,8 @@ CONFIGURATION
   NOTE: Occasionally you will need to consider the position of
   with_release in your configuration.  If you want to override options
   handled by a release definition then you will obviously need to set
-  them later in your configuration.  Some options will need to appear
-  before with_release so that they can be used within a release
+  them later in your configuration.  This will be the case for most
+  options you will want to set.  However, some options will need to
+  appear before with_release so that they can be used within a release
   definition - the most obvious one is the (rarely used) RHEL_ARCH
   option, which is used in the default ISO setting for each release.

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..2d53ee6
--- /dev/null
+++ b/TODO
@@ -0,0 +1,8 @@
+* SHAREDDISKSIZE can now be set to empty to avoid creation of shared
+  disks.  However, the various node templates still contain the shared
+  disk definitions so this causes an error.
+
+  Need a way of working around this.  One possibility is to have a
+  file containing a separate fragment for the shared disks and then
+  process that along with other indirects.  However, this suggests
+  that the handling of indirects needs to be generalised somehow.

diff --git a/base/root/scripts/conf.base b/base/root/scripts/conf.base-SoFS
similarity index 100%
rename from base/root/scripts/conf.base
rename to base/root/scripts/conf.base-SoFS

diff --git a/base/root/scripts/setup_samba.sh b/base/root/scripts/setup_samba.sh
index 72f6acd7a2bfe5461f72e42bd477b4801b06ab73..94d78b6a847e0b1cdda06148c2708fc48dac673e 100755 (executable)
--- a/base/root/scripts/setup_samba.sh
+++ b/base/root/scripts/setup_samba.sh
@@ -10,7 +10,10 @@ trap 'es=$?;
       exit $es' ERR
 
 domain_auth="administrator"
-conf_file="/root/scripts/conf.base"
+
+conf_file="/root/scripts/conf.base-SoFS"
+[ -f "${conf_file}-@@SOFS_VERSION@@" ] && \
+    conf_file="${conf_file}-@@SOFS_VERSION@@"
 
 . /root/scripts/functions
 
@@ -85,7 +88,7 @@ echo "Starting smbd to initialise registry"
 sleep 5
 killall smbd
 
-echo "Restoring base config"
+echo "Restoring base config from $conf_file"
 cnconfig restore "$conf_file"
 
 echo "Forcing config reload"

diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index d98ec94c301a0aec2478367c5a2e78110d191570..1229043ea9cd7d7b51363469cbafab083cd687b7 100644 (file)
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -93,7 +93,7 @@ defconf ROOTSIZE 15000 \
 defconf SWAPSIZE 2000 \
        "<n>" "size of swap partition in MB"
 
-defconf MEM 384000 \
+defconf MEM 262144 \
        "<n>" "memory allocated for each node"
 
 defconf NICMODEL "e1000" \

diff --git a/config.d/50sofs.defconf b/config.d/50sofs.defconf
index 721126df5a9cd042f0844c713069be19778f1d84..897971058b8abe6b166ce30fd7cc0960987e8748 100644 (file)
--- a/config.d/50sofs.defconf
+++ b/config.d/50sofs.defconf
@@ -24,7 +24,7 @@ defconf WITH_SOFS_GUI 1 \
 
 # memory for the node that will run the SoFS GUI - used if it is
 # greater than $MEM
-defconf GUIMEM 700000 \
+defconf GUIMEM 720896 \
        "<n>" "memory allocated for the management node"
 
 defconf JAVA_MIN_SIZE "200M" \

diff --git a/releases/SoFS-1.5.2.release b/releases/SoFS-1.5.2.release
index 160767d13ba1f53aebd42c5be4ecff5b3d0719a2..e855dddb26a4123705017418ed801d605c9019c4 100644 (file)
--- a/releases/SoFS-1.5.2.release
+++ b/releases/SoFS-1.5.2.release
@@ -10,3 +10,7 @@ SOFS_REPO_DAILY=0
 . "${BASH_SOURCE%/*}/SoFS.common"
 #
 KS_KERNEL_OPTS="$KS_KERNEL_OPTS crashkernel=128M@16M"
+# Need extra memory to cover the above 128MB.
+MEM=$(($MEM + 131072))
+# Need that extra 128MB plus even for GUI growth.
+GUIMEM=1048576

diff --git a/releases/SoFS-1.5.3.release b/releases/SoFS-1.5.3.release
index 15d81014cc3e6724318545ebd23195ef70e947bc..55eb193d1f5e65f864115d005778f9904dc80f0d 100644 (file)
--- a/releases/SoFS-1.5.3.release
+++ b/releases/SoFS-1.5.3.release
@@ -10,3 +10,7 @@ SOFS_REPO_DAILY=0
 . "${BASH_SOURCE%/*}/SoFS.common"
 #
 KS_KERNEL_OPTS="$KS_KERNEL_OPTS crashkernel=128M@16M"
+# Need extra memory to cover the above 128MB.
+MEM=$(($MEM + 131072))
+# Need that extra 128MB plus even for GUI growth.
+GUIMEM=1048576