Adding live-package 0.99.23-1.

4 files changed, 8 insertions, 4 deletions

diff --git a/helpers/lh_installapt b/helpers/lh_installapt
index 5324402..024303d 100755
--- a/helpers/lh_installapt
+++ b/helpers/lh_installapt
@@ -5,6 +5,9 @@
 # Install aptitude
 lh_chroot "apt-get install --yes --force-yes aptitude"
 
+# FIXME
+lh_chroot "apt-key update"
+
 # Install secure apt
 if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
 [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
diff --git a/helpers/lh_installsyslinux b/helpers/lh_installsyslinux
index 76a7ad7..641f7db 100755
--- a/helpers/lh_installsyslinux
+++ b/helpers/lh_installsyslinux
@@ -6,7 +6,7 @@ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
 then
 	if [ -n "${LIVE_ENCRYPTION}" ]
 	then
-		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} live-media-encryption=${LIVE_ENCRYPTION}"
+		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
 	fi
 
 	case "${1}" in
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index e99f9e0..e2b3c0d 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -12,7 +12,7 @@ losetup -d "${DEVICE}"
 
 LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
 CYL="`echo ${FDISK_OUT} | sed -ne "s_^${LOOPDEVICE}[ *]*\([0-9]*\).*_\1_p" `"
-#OFFSET="`expr ${CYL}*512`"
+#OFFSET="`expr 512 '*' ${CYL}`"
 OFFSET="$((CYL*512))"
 
 echo loop $DEVICE at offset $OFFSET
diff --git a/helpers/lh_manifest b/helpers/lh_manifest
index 9979552..d755335 100755
--- a/helpers/lh_manifest
+++ b/helpers/lh_manifest
@@ -3,10 +3,11 @@
 # lh_manifest
 
 # Add filesystem.manifest
-lh_chroot "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
+lh_chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > "${LIVE_ROOT}"/filesystem.manifest
 
-if [ ! -z "${LIVE_MANIFEST}" ]
+if [ -n "${LIVE_MANIFEST}" ]
 then
+	# FIXME; what should that be good for anyway?
 	lh_chroot "aptitude install --assume-yes ${LIVE_MANIFEST}"
 	lh_chroot "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest-desktop
 fi