X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-sendmail;h=c503ba1c144bcbb35daba4dfdb0e52d516ec4a7d;hb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;hp=e4089e4913ca6ede41a310be74dff041e0e1c137;hpb=aa229d2908422fce286bbd65710e31b086c8a2a2;p=hvlinux.git

diff --git a/stage3/cis-sendmail b/stage3/cis-sendmail
index e4089e4..c503ba1 100755
--- a/stage3/cis-sendmail
+++ b/stage3/cis-sendmail
@@ -8,13 +8,11 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
-CUR_DIR=$(pwd)
-
 # Applying patches (if any)
 apply_patches ${1}
 
-hv_groupadd smmsp
-hv_groupadd mail
+groupadd -f smmsp
+groupadd -f mail
 hv_useradd -g smmsp -G mail smmsp
 chmod 1777 /var/mail
 mkdir -p /var/spool/mqueue
@@ -38,7 +36,7 @@ APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER')
 EOF
     
     # Configuration file for SASL2
-    echo "pwcheck_method: saslauthd" /usr/lib/sasl2/Sendmail.conf || exit 1
+    echo "pwcheck_method: saslauthd" /usr/lib/sasl2/Sendmail.conf
 fi
 
 cd sendmail
@@ -202,7 +200,7 @@ EOF
     chmod 740 /etc/mail/configure
 
     # Bootscript
-    install -v -m740 ${CUR_DIR}/bootscripts/sendmail /etc/rc.d/init.d
+    install -v -m740 ${SCRDIR}/bootscripts/sendmail /etc/rc.d/init.d
 
     # script-name start stop
     bootscript_add_rc3 sendmail 65 25
@@ -247,7 +245,7 @@ EOF
     sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /usr/local/bin/mail-if-fail
     chmod 755 /usr/local/bin/mail-if-fail
 
-    cp ${CUR_DIR}/resources/mail-files.sh /usr/local/bin
+    cp ${SCRDIR}/resources/mail-files.sh /usr/local/bin
     chmod 755 /usr/local/bin/mail-files.sh
 
     # Executing configure script.