[Merge] ~waveform/livecd-rootfs:general-tidy into livecd-rootfs:ubuntu/master

[Thomas Bechtold]

> > cat > /etc/fstab << EOM
> > LABEL=cloudimg-rootfs   /        ext4   discard,commit=30,errors=remount-ro
> > 0 1
> > EOM
> >
> > If the current code is clobbering /etc/fstab anyway, and this works, why
> > rewrite in awk instead of just dropping the unnecessary sed command?
> 
> The current code also results in throwing away any additional mounts which
> have already been added to the fstab. In the case of the raspi images, this
> includes the mount for the /boot/firmware partition.

Afaics, raspi is the only image that adds additional lines.

> Now, I'm not sure whether any other mounts should even exist at this point
> (and I've another change later on that moves that addition to a later hook
> just for consistency) but equally I don't see anything that demands that isn't
> the case, and throwing away mounts is definitely an error.

Given that this is 999-cpc-fixes.chroot from the ubuntu-cpc project, I would prefer to keep this simple and just write fstab (without sed, without aws). If raspi needs to add something, can the required change be executed afterwards?




-- 
https://code.launchpad.net/~waveform/livecd-rootfs/+git/livecd-rootfs/+merge/450874
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.