diff -Nru initramfs-tools-ubuntu-touch-0.37/debian/changelog initramfs-tools-ubuntu-touch-0.38/debian/changelog --- initramfs-tools-ubuntu-touch-0.37/debian/changelog 2013-08-26 21:08:49.000000000 +0200 +++ initramfs-tools-ubuntu-touch-0.38/debian/changelog 2013-08-28 14:37:41.000000000 +0200 @@ -1,3 +1,11 @@ +initramfs-tools-ubuntu-touch (0.38) UNRELEASED; urgency=low + + * Add a 5th column to writable-paths with the mount options; writable-paths + should use "defaults" for temporary mounts and "none" for persistent + mounts; "bind" gets preprended for persistent mounts. + + -- Loïc Minier Wed, 28 Aug 2013 14:36:33 +0200 + initramfs-tools-ubuntu-touch (0.37) saucy; urgency=low * Replace .develoepr_mode by .writable_image (LP: #1217048) diff -Nru initramfs-tools-ubuntu-touch-0.37/debian/control initramfs-tools-ubuntu-touch-0.38/debian/control --- initramfs-tools-ubuntu-touch-0.37/debian/control 2013-06-28 18:17:28.000000000 +0200 +++ initramfs-tools-ubuntu-touch-0.38/debian/control 2013-08-28 14:38:58.000000000 +0200 @@ -9,6 +9,7 @@ Architecture: all Multi-Arch: foreign Depends: initramfs-tools, abootimg, udev (>= 175-0ubuntu29), upstart, coreutils, android-tools-adbd, ${misc:Depends} +Breaks: lxc-android-config (<< 0.83~) Description: tools for mounting an Ubuntu Touch rootfs This package contains the scripts to boot an Ubuntu Touch device. It also ships a default fstab that uses the android device paths based diff -Nru initramfs-tools-ubuntu-touch-0.37/scripts/touch initramfs-tools-ubuntu-touch-0.38/scripts/touch --- initramfs-tools-ubuntu-touch-0.37/scripts/touch 2013-08-26 21:07:06.000000000 +0200 +++ initramfs-tools-ubuntu-touch-0.38/scripts/touch 2013-08-28 14:48:49.000000000 +0200 @@ -94,7 +94,7 @@ cat ${rootmnt}/etc/system-image/writable-paths | while read line; do set -- $line # Skip invalid/commented entries - ([ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ]) && continue + ([ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] || [ -z "$5" ]) && continue [ "$1" = "#" ] && continue # Skip invalid mount points @@ -103,7 +103,7 @@ if [ "$3" = "temporary" ]; then # Temporary entries are simple, just mount a tmpfs - echo "tmpfs $1 tmpfs defaults 0 1" >> $FSTAB + echo "tmpfs $1 tmpfs $5 0 1" >> $FSTAB elif [ "$3" = "persistent" ]; then # Figure out the source path if [ "$2" = "auto" ]; then @@ -135,7 +135,11 @@ fi # Write the fstab entry - echo "$path $1 none bind 0 1" >> $FSTAB + if [ "$5" = "none" ]' then + echo "$path $1 none bind 0 1" >> $FSTAB + else + echo "$path $1 none bind,$5 0 1" >> $FSTAB + fi else continue fi