From 3e85549e361f985c00a39a09132f52abb2cfa60a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 30 Sep 2013 09:35:08 +0200 Subject: [PATCH] do not handle /etc/adjtime, it should not be in phone builds altogether --- debian/changelog | 2 +- live-build/ubuntu-touch/hooks/03-etc-writable.chroot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5dcea26..d2e71d7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ livecd-rootfs (2.190) UNRELEASED; urgency=low * ubuntu-touch: Add 03-etc-writable.chroot hook to move/symlink files in /etc to /etc/writable/ that we need to update atomically. At the moment - these are adjtime, timezone, localtime. (LP: #1227520) + these are timezone and localtime. (LP: #1227520) -- Martin Pitt Wed, 25 Sep 2013 11:06:03 +0200 diff --git a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot index 8421cf4c..5ebf103e 100755 --- a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot +++ b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot @@ -4,7 +4,7 @@ set -x mkdir -p /etc/writable -for f in adjtime timezone localtime; do +for f in timezone localtime; do if [ -e /etc/$f ]; then echo "I: Moving /etc/$f to /etc/writable/" mv /etc/$f /etc/writable/$f