From 6d7d128ad749dc2b0164071d141fcf14a8c1b67d Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 3 Mar 2015 15:14:02 +0100 Subject: [PATCH] add info about /var/log ownership so it ends up in the ubuntu-touch build logs --- debian/changelog | 7 +++++++ live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early | 4 +++- live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d5c8aba..53a16cc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.289) UNRELEASED; urgency=medium + + * add info about /var/log ownership so it ends up in the ubuntu-touch build + logs + + -- Oliver Grawert Tue, 03 Mar 2015 15:10:07 +0100 + livecd-rootfs (2.288) vivid; urgency=low [ Michael Vogt ] diff --git a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early index ac83689f..97bea6ce 100755 --- a/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early +++ b/live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early @@ -298,7 +298,9 @@ mkdir -p /var/lib/usermetrics chown usermetrics:usermetrics /var/lib/usermetrics chmod 750 /var/lib/usermetrics -chgrp syslog /var/log +echo "adjusting ownership of /var/log" >&2 +chown root:syslog /var/log +ls -ln /var | grep log >&2 # Record the current state for later comparison for file in /etc/passwd /etc/shadow /etc/group /etc/gshadow; do diff --git a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot b/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot index 6166e594..0d43bbd3 100755 --- a/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot +++ b/live-build/ubuntu-touch/hooks/99zz-check-uid-gid.chroot @@ -49,4 +49,7 @@ if [ -n "$ERRCNT" ]; then exit 1 fi +echo "ownership of /var/log after build:" >&2 +ls -ln /var| grep log >&2 + rm /etc/passwd.orig /etc/shadow.orig /etc/group.orig /etc/gshadow.orig