summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-27 12:28:02 +0100
committerHolger Levsen <holger@layer-acht.org>2014-10-27 12:28:02 +0100
commit53e094da768f81aa1775cb5fdd1771f9ea9aceb5 (patch)
tree2659d8b507f12a944eed17d5ff1aee85ecb9ff78
parentae0d68031343ea6d087e7fcdae88b3d730d9b635 (diff)
downloadjenkins.debian.net-53e094da768f81aa1775cb5fdd1771f9ea9aceb5.tar.xz
g-i-i: be more verbose
-rw-r--r--bin/g-i-installation.sh4
-rw-r--r--etc/sudoers.d/jenkins2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index e7b8ee9c..435823ab 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1058,7 +1058,7 @@ save_logs() {
# copy logs (and continue if some logs cannot be copied)
#
set +e
- sudo cp -r $SYSTEM_MNT/var/log/installer $SYSTEM_MNT/etc/fstab $RESULTS/log/ || ( ls $SYSTEM_MNT ; echo ; ls $SYSTEM_MNT/var ; echo ; ls $SYSTEM_MNT/var/log/ ; figlet "why no logs" ) || true
+ sudo cp -rv $SYSTEM_MNT/var/log/installer $SYSTEM_MNT/etc/fstab $RESULTS/log/ || ( ls -lad $SYSTEM_MNT ; echo ; ls $SYSTEM_MNT/var ; echo ; ls $SYSTEM_MNT/var/log/ ; figlet "why no logs" ) || true
set -e
#
# get list of installed packages
@@ -1081,7 +1081,7 @@ save_logs() {
echo "Warning: no LTSP chroot found."
fi
if [ ! -z "$LTSPARCH" ] ; then
- sudo cp -r $SYSTEM_MNT/opt/ltsp/$LTSPARCH/var/log $RESULTS/log/opt/
+ sudo cp -rv $SYSTEM_MNT/opt/ltsp/$LTSPARCH/var/log $RESULTS/log/opt/
sudo chroot $SYSTEM_MNT/opt/ltsp/$LTSPARCH dpkg -l > $RESULTS/log/opt/dpkg-l || ( echo "Warning: cannot run dpkg inside the ltsp chroot." ; sudo ls -la $SYSTEM_MNT/opt/ltsp/$LTSPARCH ; figlet "fail" )
fi
sudo umount -l $SYSTEM_MNT/opt || ( echo "Warning: cannot un-mount $SYSTEM_MNT/opt" ; figlet "fail" )
diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 53bebf22..6b5c35ee 100644
--- a/etc/sudoers.d/jenkins
+++ b/etc/sudoers.d/jenkins
@@ -24,7 +24,7 @@ jenkins ALL= \
/sbin/lvcreate *, /sbin/lvremove *, \
/bin/mkdir -p /media/*, \
/usr/bin/guestmount *, \
- /bin/cp -r /media/*, \
+ /bin/cp -rv /media/*, \
/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
/bin/mv /var/cache/pbuilder/base*.tgz /var/cache/pbuilder/base*.tgz, \