diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-04-17 23:00:05 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2009-04-17 23:00:05 +1000 |
| commit | 30279189108e2f484e743ab7d5f30abcffb4a699 (patch) | |
| tree | d18d2d68388731b19d5df69c74eca91ac59b5848 /base/root/scripts | |
| parent | c100e2cfe60c8a56a7154c7ad1ee17006a84a9b3 (diff) | |
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>
Diffstat (limited to 'base/root/scripts')
| -rw-r--r-- | base/root/scripts/conf.base-SoFS (renamed from base/root/scripts/conf.base) | 0 | ||||
| -rwxr-xr-x | base/root/scripts/setup_samba.sh | 7 |
2 files changed, 5 insertions, 2 deletions
diff --git a/base/root/scripts/conf.base b/base/root/scripts/conf.base-SoFS index 10b5dfd..10b5dfd 100644 --- a/base/root/scripts/conf.base +++ b/base/root/scripts/conf.base-SoFS diff --git a/base/root/scripts/setup_samba.sh b/base/root/scripts/setup_samba.sh index 72f6acd..94d78b6 100755 --- 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" |