autoport cron: fix some log paths with the ones used by current autodist/autoport
This commit is contained in:
parent
ffff0b1c10
commit
eebf7f263d
@ -43,14 +43,14 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${AUTOPORT_CHROOT[$i]}" ]; then
|
if [ "${AUTOPORT_CHROOT[$i]}" ]; then
|
||||||
LOGFILE="/var/autodist/log/autoport-chroot-${AUTOPORT_CHROOT[$i]}.log"
|
LOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}.log"
|
||||||
LASTLOGFILE="/var/autodist/log/autoport-chroot-${AUTOPORT_CHROOT[$i]}-last.log"
|
LASTLOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}-last.log"
|
||||||
elif [ "${AUTOPORT_NATIVE[$i]}" ]; then
|
elif [ "${AUTOPORT_NATIVE[$i]}" ]; then
|
||||||
LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
|
LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
|
||||||
LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
|
LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
|
||||||
elif [ "${AUTOPORT_CROSS[$i]}" ]; then
|
elif [ "${AUTOPORT_CROSS[$i]}" ]; then
|
||||||
LOGFILE="/var/autodist/log/autoport-cross-${AUTOPORT_CROSS[$i]}.log"
|
LOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}.log"
|
||||||
LASTLOGFILE="/var/autodist/log/autoport-cross-${AUTOPORT_CROSS[$i]}-last.log"
|
LASTLOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}-last.log"
|
||||||
else
|
else
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
@ -73,7 +73,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
|
|||||||
ln -s /bin/true /var/autoport/$a/sbin/service
|
ln -s /bin/true /var/autoport/$a/sbin/service
|
||||||
$CMD_PREFIX /usr/sbin/chroot /var/autoport/$a su -l ${AUTOPORT_CHROOT_USER[$i]} -c "autoport -b -r $r" >> $LOGFILE
|
$CMD_PREFIX /usr/sbin/chroot /var/autoport/$a su -l ${AUTOPORT_CHROOT_USER[$i]} -c "autoport -b -r $r" >> $LOGFILE
|
||||||
mv /var/autoport/$a/sbin/service.autoport /var/autoport/$a/sbin/service
|
mv /var/autoport/$a/sbin/service.autoport /var/autoport/$a/sbin/service
|
||||||
cat /var/autoport/$a/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/${r}.log >> $LOGFILE
|
cat /var/autoport/$a/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log >> $LOGFILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${AUTOPORT_NATIVE[$i]}" ]; then
|
if [ "${AUTOPORT_NATIVE[$i]}" ]; then
|
||||||
@ -84,7 +84,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
|
|||||||
LANG=C smart upgrade -y >> $LOGFILE
|
LANG=C smart upgrade -y >> $LOGFILE
|
||||||
echo "= Working on $r($a) in native mode" >> $LOGFILE
|
echo "= Working on $r($a) in native mode" >> $LOGFILE
|
||||||
su -l autodist -c "autoport -b -r $r" >> $LOGFILE
|
su -l autodist -c "autoport -b -r $r" >> $LOGFILE
|
||||||
cat /var/autodist/.autoport/$a/log >> $LOGFILE
|
cat /var/autodist/.autoport/$a/$r-current.log >> $LOGFILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${AUTOPORT_CROSS[$i]}" ]; then
|
if [ "${AUTOPORT_CROSS[$i]}" ]; then
|
||||||
@ -92,7 +92,7 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
|
|||||||
[[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r($a) in cross-platform mode"
|
[[ "`/usr/bin/tty`" != "not a tty" ]] && echo "Working on $r($a) in cross-platform mode"
|
||||||
echo "= Working on $r($a) in cross-platform mode" >> $LOGFILE
|
echo "= Working on $r($a) in cross-platform mode" >> $LOGFILE
|
||||||
su -l autodist -c "autoport -b -x $a -r $r" >> $LOGFILE
|
su -l autodist -c "autoport -b -x $a -r $r" >> $LOGFILE
|
||||||
cat /var/autodist/.autoport/$a/log >> $LOGFILE
|
cat /var/autodist/.autoport/$a/$r-current.log >> $LOGFILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "- Autoport end at `date`" >> $LOGFILE
|
echo "- Autoport end at `date`" >> $LOGFILE
|
||||||
|
Loading…
Reference in New Issue
Block a user