Update of /cvsroot/leaf/src/bering-uclibc/apps/config
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25154
Modified Files:
config.cfg lrcfg.backup
Log Message:
small cleanup by removing wtmp option
Index: lrcfg.backup
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/config/lrcfg.backup,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lrcfg.backup 4 Oct 2006 20:01:58 -0000 1.2
--- lrcfg.backup 15 Oct 2006 13:48:52 -0000 1.3
***************
*** 8,12 ****
# Dave Cinege, Charles Steinkuehler, Eric Wolzak
#
- WTMP=on
CWRT=on
--- 8,11 ----
***************
*** 27,54 ****
MNT=$BACKUP_PATH; test -d $MNT || usage
PACKAGE=$1; test $PACKAGE != "configdb" -a $PACKAGE != "moddb" &&
usage
!
! if [ "$WTMP" = "on" ] ; then
! DIR="/tmp"
! else
! DIR="$MNT"
! fi
!
! if [ "$CWRT" = "on" ] && [ "$WTMP" = "off" ] ; then
! echo
! echo -n "Begin copy to device? (No space check!) "
!
! read YN
! if [ ! "$YN" = "y" ] ; then
!
! echo "Exiting..."
! sleep 2
! exit 1
! fi
! fi
echo -n "Creating $PACKAGE.lrp Please wait: "
-
ticker &
-
cd /
if [ $PACKAGE = configdb ] ; then
--- 26,33 ----
MNT=$BACKUP_PATH; test -d $MNT || usage
PACKAGE=$1; test $PACKAGE != "configdb" -a $PACKAGE != "moddb" &&
usage
! DIR="/tmp"
echo -n "Creating $PACKAGE.lrp Please wait: "
ticker &
cd /
if [ $PACKAGE = configdb ] ; then
***************
*** 58,101 ****
/usr/sbin/apkg -d $DIR > /dev/null 2>&1
fi
-
killall ticker >/dev/null 2>&1
echo -n \
! if [ "$WTMP" = "on" ]; then
! if [ "$CWRT" = "on" ]; then
! echo
! echo "New Package:"
! ls -l /tmp/$PACKAGE.lrp
! echo "Old Package:"
! ls -l $MNT/$PACKAGE.lrp
! df $MNT
! echo
! echo -n "Enough freespace? (y/N) "
!
! read YN
!
! if [ ! "$YN" = "y" ]; then
! echo "Exiting..."
! rm /tmp/$PACKAGE.lrp
! sleep 2
! exit 1
! fi
! fi
!
! echo -n "Copying $PACKAGE.lrp Please wait: "
! ticker &
!
! if ! cp /tmp/$PACKAGE.lrp $MNT/$PACKAGE.lrp >/dev/null 2>&1; then
! echo "Could not move /tmp/$PACKAGE.lrp to $MNT/$PACKAGE.lrp"
sleep 2
- killall ticker >/dev/null 2>&1
exit 1
fi
!
! killall ticker >/dev/null 2>&1
! echo -n \
! rm /tmp/$PACKAGE.lrp
fi
exit 0
--- 37,75 ----
/usr/sbin/apkg -d $DIR > /dev/null 2>&1
fi
killall ticker >/dev/null 2>&1
echo -n \
! if [ "$CWRT" = "on" ]; then
! echo
! echo "New Package:"
! ls -l $DIR/$PACKAGE.lrp
! echo "Old Package:"
! ls -l $MNT/$PACKAGE.lrp
! df $MNT
! echo
! echo -n "Enough freespace? (y/N) "
!
! read YN
!
! if [ ! "$YN" = "y" ]; then
! echo "Exiting..."
! rm $DIR/$PACKAGE.lrp
sleep 2
exit 1
fi
! fi
! echo -n "Copying $PACKAGE.lrp Please wait: "
! ticker &
! if ! cp $DIR/$PACKAGE.lrp $MNT/$PACKAGE.lrp >/dev/null 2>&1; then
! echo "Could not move $DIR/$PACKAGE.lrp to $MNT/$PACKAGE.lrp"
! sleep 2
! killall ticker >/dev/null 2>&1
! exit 1
fi
+ killall ticker >/dev/null 2>&1
+ echo -n \
+
+ rm $DIR/$PACKAGE.lrp
exit 0
Index: config.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/config/config.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.cfg 26 Jun 2006 18:09:42 -0000 1.1
--- config.cfg 15 Oct 2006 13:48:52 -0000 1.2
***************
*** 1,4 ****
- # Write to /tmp before /mnt (on/off)
- WTMP=on
# Confirm writes (on/off)
CWRT=on
--- 1,2 ----
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
