From 553526f375ecdc590c6f86b8c1fe93602c188315 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 30 Sep 2013 13:59:59 +0200 Subject: [PATCH] Import patches-unapplied version 2.191 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 17d25fe43c40688f2d12a5c6d3604ca9a4869fa6 New changelog entries: * ubuntu-touch: Make writable symlinks relative. * 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 timezone and localtime. (LP: #1227520) --- debian/changelog | 14 ++++++++++++++ .../ubuntu-touch/hooks/03-etc-writable.chroot | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100755 live-build/ubuntu-touch/hooks/03-etc-writable.chroot diff --git a/debian/changelog b/debian/changelog index 1aeb50f5..eefa3932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (2.191) saucy; urgency=low + + * ubuntu-touch: Make writable symlinks relative. + + -- Martin Pitt Mon, 30 Sep 2013 13:59:59 +0200 + +livecd-rootfs (2.190) saucy; 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 timezone and localtime. (LP: #1227520) + + -- Martin Pitt Mon, 30 Sep 2013 13:32:32 +0200 + livecd-rootfs (2.189) saucy; urgency=low * Explicitly add the ubuntu-desktop task to Edubuntu builds, so that any diff --git a/live-build/ubuntu-touch/hooks/03-etc-writable.chroot b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot new file mode 100755 index 00000000..4fc2c6dc --- /dev/null +++ b/live-build/ubuntu-touch/hooks/03-etc-writable.chroot @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +set -x + +mkdir -p /etc/writable + +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 + fi + echo "I: Linking /etc/$f to /etc/writable/" + ln -s writable/$f /etc/$f +done