diff options
| author | Jeremy Allison <jra@samba.org> | 2001-10-23 18:19:42 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-10-23 18:19:42 +0000 |
| commit | 25f91d90b4edb00b994656c7acad6651ee4f7e4f (patch) | |
| tree | c7d74a82f88d5135c447a06da6ce9a4f24426f23 /packaging | |
| parent | 4fa3f238d706d7ef2f3f064169cfd2f45ff5b1f2 (diff) | |
| download | samba-25f91d90b4edb00b994656c7acad6651ee4f7e4f.tar.gz | |
Don't overwrite existing /etc/samba/smb.conf or other files if both /etc/smb.conf
and /etc/samba/smb.conf both exist.
Thanks to jht for this bug.
Jeremy.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RedHat/samba2.spec.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl index 844ee4bac8c..d6fbb4c59a6 100644 --- a/packaging/RedHat/samba2.spec.tmpl +++ b/packaging/RedHat/samba2.spec.tmpl @@ -279,31 +279,31 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig smb off echo "Looking for old /etc/smb.conf..." -if [ -f /etc/smb.conf ]; then +if [ -f /etc/smb.conf -a ! -f /etc/samba/smb.conf ]; then echo "Moving old /etc/smb.conf to /etc/samba/smb.conf" mv /etc/smb.conf /etc/samba/smb.conf fi echo "Looking for old /etc/smbusers..." -if [ -f /etc/smbusers ]; then +if [ -f /etc/smbusers -a ! -f /etc/samba/smbusers ]; then echo "Moving old /etc/smbusers to /etc/samba/smbusers" mv /etc/smbusers /etc/samba/smbusers fi echo "Looking for old /etc/lmhosts..." -if [ -f /etc/lmhosts ]; then +if [ -f /etc/lmhosts -a ! -f /etc/samba/lmhosts ]; then echo "Moving old /etc/lmhosts to /etc/samba/lmhosts" mv /etc/lmhosts /etc/samba/lmhosts fi echo "Looking for old /etc/MACHINE.SID..." -if [ -f /etc/MACHINE.SID ]; then +if [ -f /etc/MACHINE.SID -a ! -f /etc/samba/MACHINE.SID ]; then echo "Moving old /etc/MACHINE.SID to /etc/samba/MACHINE.SID" mv /etc/MACHINE.SID /etc/samba/MACHINE.SID fi echo "Looking for old /etc/smbpasswd..." -if [ -f /etc/smbpasswd ]; then +if [ -f /etc/smbpasswd -a ! -f /etc/samba/smbpasswd ]; then echo "Moving old /etc/smbpasswd to /etc/samba/smbpasswd" mv /etc/smbpasswd /etc/samba/smbpasswd fi |