summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-09-26 17:43:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:16 -0500
commit2606996653a1bd6d0bb7efc1c5c00afb554e0630 (patch)
treea6577b9faeab4f5471c97794605d7dcf99412570
parent7db71eac7a7b5a46b181130ea6a35fde3e7b9ef5 (diff)
downloadsamba-2606996653a1bd6d0bb7efc1c5c00afb554e0630.tar.gz
samba-2606996653a1bd6d0bb7efc1c5c00afb554e0630.tar.bz2
samba-2606996653a1bd6d0bb7efc1c5c00afb554e0630.zip
r25354: Thanks to Amin Azez <azez@ufomechanic.net> for finally getting me to
fix a provision without an smb.conf already setup. Andrew Bartlett (This used to be commit a00044d2294b482ea83e9d7392eb8113a9c94b6e)
-rwxr-xr-xsource4/script/gdb_run1
-rwxr-xr-xsource4/script/installmisc.sh3
-rw-r--r--source4/setup/provision.smb.conf.standalone (renamed from source4/setup/provision.smb.conf.standlone)0
3 files changed, 3 insertions, 1 deletions
diff --git a/source4/script/gdb_run b/source4/script/gdb_run
index bfefce1ac9..146259d705 100755
--- a/source4/script/gdb_run
+++ b/source4/script/gdb_run
@@ -8,7 +8,6 @@ TMPFILE=$TMPDIR/gdb_run.$$
cat << EOF > $TMPFILE
run
bt
-quit
EOF
trap "/bin/rm -f $TMPFILE" EXIT
diff --git a/source4/script/installmisc.sh b/source4/script/installmisc.sh
index d0216aca73..55297c43d9 100755
--- a/source4/script/installmisc.sh
+++ b/source4/script/installmisc.sh
@@ -25,6 +25,9 @@ cp setup/*.ldif $SETUPDIR || exit 1
cp setup/*.reg $SETUPDIR || exit 1
cp setup/*.zone $SETUPDIR || exit 1
cp setup/*.conf $SETUPDIR || exit 1
+cp setup/provision.smb.conf.dc $SETUPDIR || exit 1
+cp setup/provision.smb.conf.member $SETUPDIR || exit 1
+cp setup/provision.smb.conf.standalone $SETUPDIR || exit 1
echo "Installing script tools"
mkdir -p "$BINDIR"
diff --git a/source4/setup/provision.smb.conf.standlone b/source4/setup/provision.smb.conf.standalone
index bc37d4f3d3..bc37d4f3d3 100644
--- a/source4/setup/provision.smb.conf.standlone
+++ b/source4/setup/provision.smb.conf.standalone