summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2008-07-14 16:49:22 -0400
committerBill Nottingham <notting@redhat.com>2008-07-14 16:49:22 -0400
commit59a6eb358bdef38a7ea438060a50645e47bf4be6 (patch)
tree80d03c1ee761e35e0a3915978188e9d522baa846
parent3f312d46185413f1ec46bb337b4c124b0f954e87 (diff)
downloadinitscripts-59a6eb358bdef38a7ea438060a50645e47bf4be6.tar.gz
initscripts-59a6eb358bdef38a7ea438060a50645e47bf4be6.tar.xz
initscripts-59a6eb358bdef38a7ea438060a50645e47bf4be6.zip
Fix mcheck stuff to be installed correctly.
-rw-r--r--Makefile3
-rw-r--r--profile.d/mcheck.csh4
-rw-r--r--profile.d/mcheck.sh7
3 files changed, 2 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 0c5384cc..93e53c8b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ install:
install -m644 rwtab statetab networks $(ROOT)/etc
install -m755 service setsysfont $(ROOT)/sbin
install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d
+ install -m644 mcheck.csh mcheck.sh $(ROOT)/etc/profile.d
install -m755 sys-unconfig $(ROOT)/usr/sbin
install -m644 crypttab.5 $(ROOT)$(mandir)/man5
install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
@@ -43,7 +44,7 @@ install:
install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
install -m755 rc.d/rc rc.d/rc.local rc.d/rc.sysinit $(ROOT)/etc/rc.d/
cp -af rc.d/init.d $(ROOT)/etc/rc.d/
- install -m755 sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
+ install -m755 sysconfig/mcheck sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
cp -af ppp udev NetworkManager event.d $(ROOT)/etc
mkdir -p $(ROOT)/etc/ppp/peers
diff --git a/profile.d/mcheck.csh b/profile.d/mcheck.csh
deleted file mode 100644
index 94149026..00000000
--- a/profile.d/mcheck.csh
+++ /dev/null
@@ -1,4 +0,0 @@
-
-if ( -f /etc/sysconfig/mcheck ) then
- setenv MALLOC_CHECK_ = `grep "^MALLOC_CHECK_=" /etc/sysconfig/mcheck | cut -d"=" -f2`
-endif
diff --git a/profile.d/mcheck.sh b/profile.d/mcheck.sh
deleted file mode 100644
index 35f076cf..00000000
--- a/profile.d/mcheck.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-
-if [ -f /etc/sysconfig/mcheck ]; then
- . /etc/sysconfig/mcheck
- if [ -n "$MALLOC_CHECK_" ]; then
- export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
- fi
-fi