fix bugs 147375 147502 146600 146524 147739
This commit is contained in:
parent
0684c91532
commit
aab892954b
10
dhcp.spec
10
dhcp.spec
@ -140,11 +140,11 @@ int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
|
||||
EOF
|
||||
cc -o findptrsize findptrsize.c
|
||||
[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
|
||||
#%ifarch s390 s390x
|
||||
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
|
||||
#%else
|
||||
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
|
||||
#%endif
|
||||
%ifarch s390 s390x
|
||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
|
||||
%else
|
||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
|
||||
%endif
|
||||
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
|
||||
./configure --copts "$RPM_OPT_FLAGS"
|
||||
# -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
|
||||
|
30
dhcpd.init
30
dhcpd.init
@ -27,17 +27,30 @@ prog="dhcpd"
|
||||
|
||||
configtest()
|
||||
{
|
||||
/usr/sbin/dhcpd -t
|
||||
CFA=''
|
||||
if [[ "$DHCPDARGS" = *-cf* ]]; then
|
||||
CFA=`echo $DHCPDARGS | sed 's/^.*-cf[\ \ ]*/-cf/;s/[\ \ ].*$//'`;
|
||||
fi;
|
||||
/usr/sbin/dhcpd -t $CFA
|
||||
return $?
|
||||
}
|
||||
|
||||
start() {
|
||||
# Start daemons.
|
||||
echo -n $"Starting $prog: "
|
||||
daemon /usr/sbin/dhcpd ${DHCPDARGS}
|
||||
daemon /usr/sbin/dhcpd 2>/dev/null
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcpd
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
touch /var/lock/subsys/dhcpd
|
||||
if [ -x /usr/bin/logger ]; then
|
||||
/usr/bin/logger -t dhcpd 'dhcpd startup succeeded'
|
||||
fi;
|
||||
else
|
||||
if [ -x /usr/bin/logger ]; then
|
||||
/usr/bin/logger -t dhcpd 'dhcpd startup failed'
|
||||
fi;
|
||||
fi
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
@ -47,7 +60,16 @@ stop() {
|
||||
killproc dhcpd
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dhcpd
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
rm -f /var/lock/subsys/dhcpd
|
||||
if [ -x /usr/bin/logger ]; then
|
||||
/usr/bin/logger -t dhcpd 'dhcpd shutdown succeeded'
|
||||
fi;
|
||||
else
|
||||
if [ -x /usr/bin/logger ]; then
|
||||
/usr/bin/logger -t dhcpd 'dhcpd shutdown failed'
|
||||
fi;
|
||||
fi
|
||||
return $RETVAL
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user