View | Details | Raw Unified | Return to bug 49399 | Differences between
and this patch

Collapse All | Expand All

(-)a/services/univention-samba4/sbin/univention-samba4-backup (-11 / +10 lines)
 Lines 73-78   display_help() { Link Here 
73
	EOL
73
	EOL
74
}
74
}
75
75
76
terminate_on_error() {
77
	>&2 echo "$*" 
78
	exit 1
79
}
80
76
FROMWHERE=/var/lib/samba
81
FROMWHERE=/var/lib/samba
77
WHERE=/var/univention-backup/samba
82
WHERE=/var/univention-backup/samba
78
DAYS=""
83
DAYS=""
 Lines 112-124   while [ $# -gt 0 ]; do Link Here 
112
done
117
done
113
118
114
if [ ! -d $WHERE ]; then
119
if [ ! -d $WHERE ]; then
115
	echo "Missing backup directory $WHERE"
120
	terminate_on_error "Missing backup directory $WHERE"
116
	exit 1
117
fi
121
fi
118
122
119
if [ ! -d $FROMWHERE ]; then
123
if [ ! -d $FROMWHERE ]; then
120
	echo "Missing or wrong provision directory $FROMWHERE"
124
	terminate_on_error "Missing or wrong provision directory $FROMWHERE"
121
	exit 1
122
fi
125
fi
123
126
124
cd $FROMWHERE
127
cd $FROMWHERE
 Lines 137-144   for d in $DIRS; do Link Here 
137
					tdbbackup $file
140
					tdbbackup $file
138
					Status=$?
141
					Status=$?
139
					if [ $Status -ne 0 ]; then
142
					if [ $Status -ne 0 ]; then
140
						>&2 echo "Error while backing up $file with tdbbackup - status $Status"
143
						terminate_on_error "Error while backing up $file with tdbbackup - status $Status"
141
						exit 1
142
					fi
144
					fi
143
				fi
145
				fi
144
			done
146
			done
 Lines 157-164   for d in $DIRS; do Link Here 
157
		Status=$?
159
		Status=$?
158
		if [ $Status -ne 0 -a $Status -ne 1 ]; then
160
		if [ $Status -ne 0 -a $Status -ne 1 ]; then
159
			# Ignore 1 - private dir is always changing.
161
			# Ignore 1 - private dir is always changing.
160
			echo "Error while archiving ${WHERE}/samba4_${n}.${WHEN}.tar.bz2 - status = $Status"
162
			terminate_on_error "Error while archiving ${WHERE}/samba4_${n}.${WHEN}.tar.bz2 - status = $Status"
161
			exit 1
162
		fi
163
		fi
163
		for db in tdb ldb; do
164
		for db in tdb ldb; do
164
			find $relativedirname -name "*.$db.bak" -exec rm {} \;
165
			find $relativedirname -name "*.$db.bak" -exec rm {} \;
 Lines 173-180   for d in $DIRS; do Link Here 
173
		Status=$?
174
		Status=$?
174
		if [ $Status -ne 0 -a $Status -ne 1 ]; then
175
		if [ $Status -ne 0 -a $Status -ne 1 ]; then
175
			# Ignore 1 - sysvol may change
176
			# Ignore 1 - sysvol may change
176
			echo "Error while archiving ${WHERE}/${n}.${WHEN}.tar.bz2 - status = $Status"
177
			terminate_on_error "Error while archiving ${WHERE}/${n}.${WHEN}.tar.bz2 - status = $Status"
177
			exit 1
178
		fi
178
		fi
179
	fi
179
	fi
180
done
180
done
181
- 

Return to bug 49399