From 00196645683d7a4614faf7444d0f98f0f68c8cfb Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont.jones@canonical.com>
Date: Sat, 5 Mar 2005 22:58:27 +0000
Subject: [PATCH] and nuke myorigin too.

---
 livecd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/livecd.sh b/livecd.sh
index c97a6bca..28baa62c 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -205,7 +205,7 @@ deb-src http://security.ubuntu.com/ubuntu ${STE}-security main restricted
     rm -f ${ROOT}var/spool/postfix/maildrop/*
     chroot $ROOT apt-get update || true	# give them fresh lists, but don't fail
     rm ${ROOT}etc/resolv.conf ${ROOT}etc/mailname
-    sed -i '/^myhostname/d; /^mydestination/d' ${ROOT}etc/postfix/main.cf
+    sed -i '/^myhostname/d; /^mydestination/d; /^myorigin/d' ${ROOT}etc/postfix/main.cf
     echo set postfix/destinations | chroot ${ROOT}/usr/bin/debconf-communicate postfix
     echo set postfix/mailname | chroot ${ROOT}/usr/bin/debconf-communicate postfix
     chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' > livecd.${FS}.manifest