summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-23 12:52:14 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-23 12:52:14 +0100
commit1941fee17fcbc5893140acf2d3e73932b798e351 (patch)
treec903261b50e138292d26d681195166dc26f6b8d9
parent314466d4b71a81c0a05957c12d8763f6bdce348c (diff)
downloadjenkins.debian.net-1941fee17fcbc5893140acf2d3e73932b798e351.tar.xz
use : for chown as posis 1003.1-2001 does not require support for . - thanks to Jörg Jaspert
-rwxr-xr-xbin/g-i-installation.sh2
-rw-r--r--etc/sudoers.d/jenkins2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 20128d0e..d4c96a96 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -438,7 +438,7 @@ save_logs() {
#
mkdir -p $RESULTS/log
sudo cp -r $SYSTEM_MNT/var/log/installer $RESULTS/log/
- sudo chown -R jenkins.jenkins $RESULTS/log/
+ sudo chown -R jenkins:jenkins $RESULTS/log/
#
# get list of installed packages
#
diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 429361d4..d4cab0c4 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/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