From 59fe3f5548401e263528ca83c1751ed2419ed7de Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 9 Sep 2015 18:05:00 +0200 Subject: reproducible: fixup sudo usage --- bin/reproducible_maintenance.sh | 2 +- hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins | 2 +- hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins | 2 +- hosts/hb0-armhf-rb/etc/sudoers.d/jenkins | 2 +- hosts/jenkins/etc/sudoers.d/jenkins | 2 +- hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins | 2 +- hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins | 2 +- hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh index cdcaacdb..3424a195 100755 --- a/bin/reproducible_maintenance.sh +++ b/bin/reproducible_maintenance.sh @@ -52,7 +52,7 @@ if [ ! -z "$OLDSTUFF" ] ; then fi # remove old and unused schroot sessions -ps fax|grep -v grep |grep schroot || for i in $(sudo schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || sudo schroot -c $i -e ; done +ps fax|grep -v grep |grep schroot || for i in $(sudo schroot --all-sessions -l ) ; do ps fax|grep -v grep |grep schroot || sudo schroot -e -c $i ; done # to explain this: # first, check if no process using "schroot" is running... # then loop through all schroot sessions diff --git a/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins b/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins +++ b/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins b/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins +++ b/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins b/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins +++ b/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/jenkins/etc/sudoers.d/jenkins b/hosts/jenkins/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/jenkins/etc/sudoers.d/jenkins +++ b/hosts/jenkins/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins +++ b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins +++ b/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ diff --git a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins index 29056667..f57c0a38 100644 --- a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins +++ b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins @@ -7,7 +7,7 @@ jenkins ALL= \ /usr/sbin/chroot /chroots/*, \ /usr/sbin/chroot /media/*, \ /usr/bin/schroot --all-sessions -l, \ - /usr/bin/schroot -c session:jenkins-reproducible.* -e, \ + /usr/bin/schroot -e -c *, \ /bin/ls -la /media/*, \ /bin/rm -rf --one-file-system /chroots/*, \ /bin/rm -rf --one-file-system /schroots/*, \ -- cgit v1.2.3-70-g09d2