From 2606996653a1bd6d0bb7efc1c5c00afb554e0630 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 26 Sep 2007 17:43:15 +0000 Subject: r25354: Thanks to Amin Azez for finally getting me to fix a provision without an smb.conf already setup. Andrew Bartlett (This used to be commit a00044d2294b482ea83e9d7392eb8113a9c94b6e) --- source4/script/gdb_run | 1 - source4/script/installmisc.sh | 3 +++ source4/setup/provision.smb.conf.standalone | 5 +++++ source4/setup/provision.smb.conf.standlone | 5 ----- 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 source4/setup/provision.smb.conf.standalone delete mode 100644 source4/setup/provision.smb.conf.standlone 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.standalone b/source4/setup/provision.smb.conf.standalone new file mode 100644 index 0000000000..bc37d4f3d3 --- /dev/null +++ b/source4/setup/provision.smb.conf.standalone @@ -0,0 +1,5 @@ +[globals] + netbios name = ${HOSTNAME} + workgroup = ${DOMAIN_CONF} + realm = ${REALM_CONF} + server role = ${SERVERROLE} diff --git a/source4/setup/provision.smb.conf.standlone b/source4/setup/provision.smb.conf.standlone deleted file mode 100644 index bc37d4f3d3..0000000000 --- a/source4/setup/provision.smb.conf.standlone +++ /dev/null @@ -1,5 +0,0 @@ -[globals] - netbios name = ${HOSTNAME} - workgroup = ${DOMAIN_CONF} - realm = ${REALM_CONF} - server role = ${SERVERROLE} -- cgit