From 1a62c181f05bb79e3a11e9958ac6f8dcedd663dd Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 23 Aug 2012 09:53:09 +0100
Subject: [PATCH] live-build/auto/config: Fix installation of ubuntu-server
 fstab removal hook.

---
 debian/changelog       |  2 ++
 live-build/auto/config | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a0a10ef..d3743699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ livecd-rootfs (2.76) UNRELEASED; urgency=low
 
   * live-build/auto/config: Don't try to install an empty task name when
     building an image without a live task.
+  * live-build/auto/config: Fix installation of ubuntu-server fstab removal
+    hook.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Thu, 23 Aug 2012 09:43:38 +0100
 
diff --git a/live-build/auto/config b/live-build/auto/config
index d7ad5f0b..22434759 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -291,15 +291,6 @@ case $PROJECT in
 		;;
 esac
 
-case $PROJECT in
-	ubuntu-server)
-		cat > config/hooks/100-remove-fstab.chroot <<EOF
-#! /bin/sh
-rm -f /etc/fstab
-EOF
-		;;
-esac
-
 case $SUBPROJECT in
 	wubi)
 		add_binary_hook build-wubildr
@@ -326,6 +317,15 @@ lb config noauto \
 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
 
+case $PROJECT in
+	ubuntu-server)
+		cat > config/hooks/100-remove-fstab.chroot <<EOF
+#! /bin/sh
+rm -f /etc/fstab
+EOF
+		;;
+esac
+
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*