rpms/dhcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix bugs 147375 147502 146600 146524 147739

Browse Source
This commit is contained in:
jvdias 2005-02-11 01:22:10 +00:00
parent 0684c91532
commit aab892954b
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dhcp.spec
View File

@ -140,11 +140,11 @@ int main(void) { printf("%%d\n", sizeof(void *)); return 0; }
EOF EOF
cc -o findptrsize findptrsize.c cc -o findptrsize findptrsize.c
[ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT" [ "`./findptrsize`" -ge 8 ] && RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPTRSIZE_64BIT"
#%ifarch s390 s390x %ifarch s390 s390x
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE"
#%else %else
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpie"
#%endif %endif
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'` #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's/\ \-mtune\=[^\=\ ]*//'`
./configure --copts "$RPM_OPT_FLAGS" ./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" # -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
View File

@ -27,17 +27,30 @@ prog="dhcpd"
configtest() 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 $? return $?
} }
start() { start() {
# Start daemons. # Start daemons.
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon /usr/sbin/dhcpd ${DHCPDARGS} daemon /usr/sbin/dhcpd 2>/dev/null
RETVAL=$? RETVAL=$?
echo 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 return $RETVAL
} }
@ -47,7 +60,16 @@ stop() {
killproc dhcpd killproc dhcpd
RETVAL=$? RETVAL=$?
echo 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 return $RETVAL
} }