[Merge] lp:~jamesodhunt/ubuntu/vivid/initramfs-tools-ubuntu-core/mount-boot-partition-with-sync into lp:ubuntu/initramfs-tools-ubuntu-core

[Steve Langasek]

Looks good, with one comment - which I will fix up on merge.

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2015-02-20 21:33:27 +0000
> +++ debian/changelog	2015-02-24 17:04:57 +0000
> @@ -1,8 +1,12 @@
>  initramfs-tools-ubuntu-core (0.7.4) UNRELEASED; urgency=medium
>  
> +  [ Steve Langasek ]
>    * Point Vcs-Bzr at the UDD branch now that this package is in the archive.
>  
> - -- Steve Langasek <steve.langasek at ubuntu.com>  Thu, 19 Feb 2015 07:36:50 -0800
> +  [ James Hunt ]
> +  * Mount the boot partition with "sync" to minimise change of corruption.
> +
> + -- James Hunt <james.hunt at ubuntu.com>  Tue, 24 Feb 2015 16:58:54 +0000
>  
>  initramfs-tools-ubuntu-core (0.7.3) vivid; urgency=low
>  
> 
> === modified file 'scripts/ubuntu-core-rootfs'
> --- scripts/ubuntu-core-rootfs	2015-02-20 21:33:27 +0000
> +++ scripts/ubuntu-core-rootfs	2015-02-24 17:04:57 +0000
> @@ -260,13 +260,13 @@
>  			efidir="/boot/efi"
>  			efibinddir="${efidir}/EFI/ubuntu/grub"
>  			if [ -d "${rootmnt}/${efidir}" ]; then
> -				echo "$boot_partition $efidir auto defaults 0 2" >> "$fstab"
> -				echo "$efibinddir $bootdir none bind 0 0" >> "$fstab"
> +				echo "$boot_partition $efidir auto sync 0 2" >> "$fstab"
> +				echo "$efibinddir $bootdir none bind,sync 0 0" >> "$fstab"

The bind mount does not need to be mounted sync; this is a filesystem-level option and has no effect for the bind mount, so let's omit it.

>  			fi
>  		else
>  			bootdir="$ubootdir"
>  
> -			echo "$boot_partition $bootdir auto defaults 0 2" >> "$fstab"
> +			echo "$boot_partition $bootdir auto sync 0 2" >> "$fstab"
>  		fi
>  	fi
>  
> 


-- 
https://code.launchpad.net/~jamesodhunt/ubuntu/vivid/initramfs-tools-ubuntu-core/mount-boot-partition-with-sync/+merge/250802
Your team Ubuntu branches is subscribed to branch lp:ubuntu/initramfs-tools-ubuntu-core.