Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9481
Modified Files:
Tag: rel-1-2-patches
heartbeat sysvinit
Log Message:
get format correct, so we can copy to 1.3
Index: sysvinit
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysvinit,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- sysvinit 19 Oct 2005 02:08:28 -0000 1.10.2.1
+++ sysvinit 19 Oct 2005 02:10:26 -0000 1.10.2.2
@@ -34,19 +34,19 @@
install )
cd src
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp/bin || exit 1
- mkdir -p $WORKDIR/tmp/sbin || exit 1
- mkdir -p $WORKDIR/tmp/usr/{bin,include} || exit 1
- mkdir -p $WORKDIR/tmp/usr/share/man/man{1,5,8} || exit 1
- make install ROOT=$WORKDIR/tmp || exit 1
- rm -rf $WORKDIR/tmp/usr/include || exit 1
- rm -f $WORKDIR/tmp/usr/sbin/sulogin || exit 1
- copy_docs $WORKDIR/tmp
- cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR/bin || exit 1
+ mkdir -p $TMPDIR/sbin || exit 1
+ mkdir -p $TMPDIR/usr/{bin,include} || exit 1
+ mkdir -p $TMPDIR/usr/share/man/man{1,5,8} || exit 1
+ make install ROOT=$TMPDIR || exit 1
+ rm -rf $TMPDIR/usr/include || exit 1
+ rm -f $TMPDIR/usr/sbin/sulogin || exit 1
+ copy_docs $TMPDIR
+ cp -dpR $TMPDIR/* $CDDIR/ || exit 1
# busybox reboot is crap
- #cp -dpR $WORKDIR/tmp/sbin/{halt,reboot} $INITRDDIR/sbin/ || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ #cp -dpR $TMPDIR/sbin/{halt,reboot} $INITRDDIR/sbin/ || exit 1
+ rm -rf $TMPDIR || exit 1
;;
* )
Index: heartbeat
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- heartbeat 19 Oct 2005 02:08:28 -0000 1.3.2.2
+++ heartbeat 19 Oct 2005 02:10:26 -0000 1.3.2.3
@@ -37,22 +37,22 @@
install )
if [ "$CONFIG_HEARTBEAT" = "y" ]; then
- rm -rf $WORKDIR/tmp || exit 1
- mkdir -p $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR || exit 1
+ mkdir -p $TMPDIR || exit 1
- make install DESTDIR=$WORKDIR/tmp || exit 1
+ make install DESTDIR=$TMPDIR || exit 1
- copy_docs $WORKDIR/tmp
- rm -rf $WORKDIR/tmp/usr/include || exit 1
- find $WORKDIR/tmp/usr/lib/ -name \*a | xargs rm || exit 1
- copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
- copy_files $WORKDIR/tmp/var $CDDIR/ || exit 1
- copy_files $WORKDIR/tmp/etc $ETCDIR/ || exit 1
+ copy_docs $TMPDIR
+ rm -rf $TMPDIR/usr/include || exit 1
+ find $TMPDIR/usr/lib/ -name \*a | xargs rm || exit 1
+ copy_files $TMPDIR/usr $CDDIR/ || exit 1
+ copy_files $TMPDIR/var $CDDIR/ || exit 1
+ copy_files $TMPDIR/etc $ETCDIR/ || exit 1
useradd -s /bin/false -u 50 hacluster || exit 1
groupadd -g 50 haclient || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR || exit 1
cp -dp $MYDIR/scripts/heartbeat $ETCDIR/etc/init.d/ || exit 1
|
