|
@@ -1,7 +1,7 @@
|
1
|
1
|
#!/bin/sh
|
2
|
2
|
# SlackCheck
|
3
|
3
|
#
|
4
|
|
-# $Id: slcheck.sh,v 1.34 2006/07/07 11:06:05 gf Exp $
|
|
4
|
+# $Id: slcheck.sh,v 1.35 2006/07/07 11:46:24 gf Exp $
|
5
|
5
|
#
|
6
|
6
|
# Copyright (c) 2002-2006 Georgi Chorbadzhiyski, Sofia, Bulgaria
|
7
|
7
|
# All rights reserved.
|
|
@@ -268,8 +268,7 @@ UPDATE=\"\$UPDATE ${distro_package}.tgz\" # EXISTING: ${hostpkg} \
|
268
|
268
|
) > ${DIR_UPD}/${FILE_UPDATES}${HOST}
|
269
|
269
|
fi
|
270
|
270
|
# Cleanup
|
271
|
|
- rm ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs >/dev/null 2>&1
|
272
|
|
- rm ${DIR_UPD}/${FILE_UPDATES}${HOST}.base >/dev/null 2>&1
|
|
271
|
+ rm ${DIR_UPD}/${FILE_UPDATES}${HOST}.* 2>/dev/null
|
273
|
272
|
fi
|
274
|
273
|
done
|
275
|
274
|
echo
|
|
@@ -294,17 +293,17 @@ upgrade_machines() {
|
294
|
293
|
# Use su if we're running not as root
|
295
|
294
|
if [ "$(id -u)" != "0" ]; then
|
296
|
295
|
echo " Enter root password"
|
297
|
|
- su -c "/bin/sh ${DIR_UPD}/${FILE_UPDATES}${HOST}"
|
|
296
|
+ (su -c "/bin/sh ${DIR_UPD}/${FILE_UPDATES}${HOST}") | tee ${DIR_UPD}/log_${FILE_UPDATES}${HOST}
|
298
|
297
|
else
|
299
|
|
- /bin/sh ${DIR_UPD}/${FILE_UPDATES}${HOST}
|
|
298
|
+ (/bin/sh ${DIR_UPD}/${FILE_UPDATES}${HOST}) | tee ${DIR_UPD}/log_${FILE_UPDATES}${HOST}
|
300
|
299
|
fi
|
301
|
300
|
# Remote host
|
302
|
301
|
else
|
303
|
302
|
echo " ---> $HOST"
|
304
|
|
- cat ${DIR_UPD}/${FILE_UPDATES}${HOST} | \
|
|
303
|
+ (cat ${DIR_UPD}/${FILE_UPDATES}${HOST} | \
|
305
|
304
|
${RSH_UPGRADE} ${HOST} \
|
306
|
305
|
"cat - > ${FILE_UPDATES}${HOST}_${NOW}; \
|
307
|
|
- /bin/sh ${FILE_UPDATES}${HOST}_${NOW};"
|
|
306
|
+ /bin/sh ${FILE_UPDATES}${HOST}_${NOW};") | tee ${DIR_UPD}/log_${FILE_UPDATES}${HOST}
|
308
|
307
|
fi
|
309
|
308
|
fi
|
310
|
309
|
done
|