Author: glen Date: Fri May 4 01:40:48 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- no deprecated egrep; cosmetics
---- Files affected:
packages/systemd:
pld-rc-inetd-generator.sh (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/systemd/pld-rc-inetd-generator.sh
diff -u packages/systemd/pld-rc-inetd-generator.sh:1.1
packages/systemd/pld-rc-inetd-generator.sh:1.2
--- packages/systemd/pld-rc-inetd-generator.sh:1.1 Thu May 3 21:48:16 2012
+++ packages/systemd/pld-rc-inetd-generator.sh Fri May 4 03:40:43 2012
@@ -88,7 +88,7 @@
echo "WantedBy=sockets.target" >>$SOCKET_FILE
}
-SERVICES=$(ls -d /etc/sysconfig/rc-inetd/* 2>/dev/null | egrep -v
'.*(\.rpm(save|new|orig)|~|CVS)')
+SERVICES=$(ls -d /etc/sysconfig/rc-inetd/* 2>/dev/null | grep -Ev
'.*(\.rpm(save|new|orig)|~|CVS)')
for i in $SERVICES; do
# unset everything
unset SERVICE_NAME SOCK_TYPE PROTOCOL PORT USER
@@ -100,15 +100,18 @@
unset BANNER_SUCCESS BANNER_FAILURE PASSENV
unset SERVICE_TYPE ACCESS_TIMES LOG_TYPE
unset LOG_SUCCESS LOG_FAILURE REDIRECT MAX_LOAD
+
# Read defaults...
. /etc/sysconfig/rc-inetd.conf
+
# ...and then config of *this* service.
. $i
- CURRENT_SERVICE=`basename $i`
+
+ CURRENT_SERVICE=$(basename $i)
DONT_PARSE=0
# check if service is in deny list ?
- for i in $DENY_SERVICES ; do
- if [ $i = $CURRENT_SERVICE ] ; then
+ for i in $DENY_SERVICES; do
+ if [ $i = $CURRENT_SERVICE ]; then
DONT_PARSE=1
fi
done
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/systemd/pld-rc-inetd-generator.sh?r1=1.1&r2=1.2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
