From d2e5a85da8ecb858f63641a1683a3439d765f579 Mon Sep 17 00:00:00 2001
From: LaMont Jones <lamont.jones@canonical.com>
Date: Sun, 9 Jan 2005 20:29:11 +0000
Subject: [PATCH] Add manifest

---
 debian/changelog |  6 ++++++
 livecd.sh        | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c65eaa83..6774af7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.3) hoary; urgency=low
+
+  * add manifest file
+
+ -- LaMont Jones <lamont@debian.org>  Sun,  9 Jan 2005 13:27:07 -0700
+
 livecd-rootfs (0.2) hoary; urgency=low
 
   * Better divertion setup, fix sources.list
diff --git a/livecd.sh b/livecd.sh
index 1960ad51..312e170e 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -97,22 +97,23 @@ mount -tproc none ${ROOT}proc
 cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
 cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
 
+OTHER="xresprobe laptop-detect"
 case $(dpkg --print-architecture) in
-  amd64)	KERNEL="linux-amd64-generic";;
-  i386)		KERNEL=linux-386;;
-  ia64)		KERNEL="linux-itanium-smp linux-mckinley-smp";;
-  powerpc)	KERNEL="linux-powerpc linux-power3 linux-power4";;
+  amd64)	OTHER="$OTHER linux-amd64-generic";;
+  i386)		OTHER="$OTHER linux-386";;
+  ia64)		OTHER="$OTHER linux-itanium-smp linux-mckinley-smp";;
+  powerpc)	OTHER="$OTHER linux-powerpc linux-power3 linux-power4";;
 
   # and the bastard stepchildren
-  hppa)		KERNEL="linux-hppa32 linux-hppa64";;
-  sparc*)	KERNEL="linux-sparc64";;
+  hppa)		OTHER="$OTHER linux-hppa32-smp linux-hppa64-smp";;
+  sparc*)	OTHER="$OTHER linux-sparc64";;
   *)		echo "Unknown architecture: no kernel."; exit 1;;
 esac
 
 # Create a good sources.list, and finish the install
 echo deb $MIRROR $STE main restricted > ${ROOT}etc/apt/sources.list
 chroot $ROOT apt-get update
-chroot $ROOT apt-get -y install ubuntu-base ubuntu-desktop $KERNEL </dev/null
+chroot $ROOT apt-get -y install ubuntu-base ubuntu-desktop $OTHER </dev/null
 chroot $ROOT /etc/cron.daily/slocate
 chroot $ROOT /etc/cron.daily/man-db
 
@@ -167,3 +168,5 @@ mount $DEV livecd.mnt
 rsync -a ${ROOT} livecd.mnt
 
 create_compressed_fs $IMG 65536 > livecd.cloop
+chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' > livecd.manifest
+