From 4613a2c82e23d5b6a0e002788e3e2ad534e4ada0 Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Tue, 11 Apr 2017 21:44:25 -0400
Subject: [PATCH] Don't outright remove fstab for ubuntu-server:live, that
 breaks grub-legacy-ec2.

---
 live-build/auto/config | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index f5835313..77c33db4 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -713,16 +713,15 @@ EOF
 		;;
 esac
 
-case $PROJECT in
-	ubuntu-server)
-		cat > config/hooks/100-remove-fstab.chroot <<EOF
+if [ $PROJECT = ubuntu-server ] && [ $SUBPROJECT != live ]; then
+	cat > config/hooks/100-remove-fstab.chroot <<EOF
 #! /bin/sh
 rm -f /etc/fstab
 EOF
-		;;
+fi
 
-	ubuntukylin)
-		cat > config/hooks/100-ubuntukylin.chroot <<EOF
+if [ $PROJECT = ubuntukylin ]; then
+	cat > config/hooks/100-ubuntukylin.chroot <<EOF
 #! /bin/sh
 set -e
 HOOK=/usr/share/ubuntukylin-default-settings/hooks/chroot
@@ -731,8 +730,7 @@ if [ -x \$HOOK ]; then
 fi
 exit 0
 EOF
-		;;
-esac
+fi
 
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF