diff options
| author | Holger Levsen <holger@layer-acht.org> | 2013-01-11 14:17:41 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2013-01-11 14:17:41 +0100 |
| commit | b2ac15034fc4c8cda05c452d22d5a183521ca35f (patch) | |
| tree | 72816149fcb8504356aece1d6724b26b779bc30f | |
| parent | 242d71fe23aeef60c2ce35cf4a1c61fdbb5196aa (diff) | |
| download | jenkins.debian.net-b2ac15034fc4c8cda05c452d22d5a183521ca35f.tar.xz | |
g-i: try harder to understand why combi-server misbehaves
| -rwxr-xr-x | bin/g-i-installation.sh | 3 | ||||
| -rw-r--r-- | etc/sudoers.d/jenkins | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index afe8640e..4a487cb3 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -555,6 +555,7 @@ monitor_system() { echo "Warning: snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm match, ending installation." ls -la snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm figlet "Installation hangs." + let NR=NR+1 break else # this is only reached once in rescue mode @@ -618,7 +619,7 @@ save_logs() { # # get list of installed packages # - sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/log/dpkg-l || ( echo "Error: cannot run dpkg inside the installed system." ; ls -la $SYSTEM_MNT ; figlet "fail" ) + sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/log/dpkg-l || ( echo "Error: cannot run dpkg inside the installed system." ; sudo ls -la $SYSTEM_MNT ; figlet "fail" ) # # umount guests # diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins index d4cab0c4..2bd28425 100644 --- a/etc/sudoers.d/jenkins +++ b/etc/sudoers.d/jenkins @@ -1,4 +1,4 @@ -jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, /usr/sbin/chroot /chroots/*, /usr/sbin/chroot /media/*, /bin/rm -rf --one-file-system /chroots/*, /bin/umount -l /chroots/*, /bin/umount -l /media/*, /bin/mount -o loop*, /usr/bin/du *, /bin/kill -9 *, /usr/bin/qemu-system-x86_64 *, /bin/mkdir -p /media/*, /usr/bin/guestmount *, /bin/cp -r /media/*, /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*, SETENV: NOPASSWD: /usr/sbin/pbuilder * +jenkins ALL= NOPASSWD: /usr/sbin/debootstrap *, /usr/sbin/chroot /chroots/*, /usr/sbin/chroot /media/*, /bin/ls -la /media/*, /bin/rm -rf --one-file-system /chroots/*, /bin/umount -l /chroots/*, /bin/umount -l /media/*, /bin/mount -o loop*, /usr/bin/du *, /bin/kill -9 *, /usr/bin/qemu-system-x86_64 *, /bin/mkdir -p /media/*, /usr/bin/guestmount *, /bin/cp -r /media/*, /bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*, SETENV: NOPASSWD: /usr/sbin/pbuilder * # keep these environment variables Defaults env_keep += "http_proxy", env_reset |