diff -Nur -x '*.orig' -x '*.rej' smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-backup mezzanine_patched_smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-backup --- smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-backup 2006-10-19 09:23:09.000000000 -0500 +++ mezzanine_patched_smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-backup 2007-03-22 11:26:12.000000000 -0500 @@ -61,6 +61,10 @@ /bin/mkdir -p $MOUNT/$ID/$DCF || exit 7 fi +# zip and store db's +/bin/echo "Creating $MOUNT/$ID/$DCF/db.zip" +/usr/bin/zip -q -D $MOUNT/$ID/$DCF/db.zip /home/e-smith/db/* + # expire old backups /bin/echo "Expiring old backups" if [ "$EXPIRY" == "0" ] diff -Nur -x '*.orig' -x '*.rej' smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-mc mezzanine_patched_smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-mc --- smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-mc 2007-01-07 16:53:09.000000000 -0600 +++ mezzanine_patched_smeserver-dar2-0.0.1/root/etc/e-smith/events/actions/dar2-mc 2007-03-22 11:26:12.000000000 -0500 @@ -8,62 +8,51 @@ cp -af /opt/dar2-mc/mc.ext /usr/share/mc fi -# default variables -DAR="/usr/bin/dar" -ID=$(/sbin/e-smith/config get SystemName).$(/sbin/e-smith/config get DomainName) - +# Prompt for job name clear -/bin/echo "Enter where your backup is located: usb | network" -read TYPE - /bin/echo "Enter your job name:" read DCF -if [ "$TYPE" == "usb" ] +# Check job status +STATUS=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF status) +if [ "$STATUS" != 'enabled' ] then - # usb variables - /bin/echo "Enter your usb mount point: /media/usbdisk" - read MOUNT - - /bin/echo "Connecting to $MOUNT" - /bin/mount $MOUNT + exit 0 fi -if [ "$TYPE" == "network" ] - then - # ws variables - MOUNT=/mnt/dar2 - - /bin/echo "Enter your target name: //computername/sharename" - read TARGET - - /bin/echo "Enter your username:" - read USERNAME - - /bin/echo "Enter your password:" - read PASSWORD +# variables +DAR="/usr/bin/dar" +ID=$(/sbin/e-smith/config get SystemName).$(/sbin/e-smith/config get DomainName) +MOUNT=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF Mount) +TARGET=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF Target) +USERNAME=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF Username) +PASSWORD=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF Password) +VFSTYPE=$(/sbin/e-smith/db /home/e-smith/db/dar2 getprop $DCF VFSType) - /bin/echo "Enter your filesystem type: smbfs | cifs" - read VFSTYPE +/bin/umount $MOUNT >/dev/null 2>&1 +# mount +if [ "$MOUNT" == "/mnt/dar2" ] + then MOUNT=$MOUNT/$DCF # create mount dir if [ ! -d $MOUNT ] then /bin/echo "Creating $MOUNT dir" - /bin/mkdir -p $MOUNT + /bin/mkdir -p $MOUNT || exit 1 fi - /bin/echo "Connecting $MOUNT to $TARGET" - /bin/mount -t $VFSTYPE -o username=$USERNAME,password=$PASSWORD $TARGET $MOUNT + /bin/echo "Connecting $MOUNT to $TARGET. Please wait..." + /bin/mount -t $VFSTYPE -o username=$USERNAME,password=$PASSWORD $TARGET $MOUNT || exit 2 + else + /bin/echo "Connecting to $MOUNT. Please wait..." + /bin/mount $MOUNT || exit 3 fi # check backup dir if [ ! -d $MOUNT/$ID/$DCF ] then /bin/echo "Error locating /$ID/$DCF dir" - exit 7 - else - /bin/echo "$MOUNT connected" + exit 4 fi # run Midnight Commander @@ -73,3 +62,5 @@ # dismount /bin/echo "Dismounting $MOUNT" /bin/umount -l $MOUNT & + +exit 5