r2687 - in dists/trunk/live-helper: functions helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-04 19:04:35 +0000 (Sat, 04 Aug 2007)
New Revision: 2687

Modified:
   dists/trunk/live-helper/functions/packages.sh
   dists/trunk/live-helper/helpers/lh_losetup
Log:


Modified: dists/trunk/live-helper/functions/packages.sh
===================================================================
--- dists/trunk/live-helper/functions/packages.sh	2007-08-04 18:47:14 UTC (rev 2686)
+++ dists/trunk/live-helper/functions/packages.sh	2007-08-04 19:04:35 UTC (rev 2687)
@@ -72,7 +72,7 @@
 
 	case "${LH_CHROOT_BUILD}" in
 		enabled)
-			if Chroot "dpkg-query -s ${PACKAGE}" > /dev/null 2>&1
+			if Chroot "dpkg-query -s ${PACKAGE}" | grep -qs "Status: install"
 			then
 				INSTALL_STATUS=0
 			else
@@ -82,7 +82,7 @@
 		disabled)
 			if which dpkg-query > /dev/null 2>&1
 			then
-				if Chroot "dpkg-query -s ${PACKAGE}" > /dev/null 2>&1
+				if Chroot "dpkg-query -s ${PACKAGE}" | grep -qs "Status: install"
 				then
 					INSTALL_STATUS=0
 				else

Modified: dists/trunk/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup	2007-08-04 18:47:14 UTC (rev 2686)
+++ dists/trunk/live-helper/helpers/lh_losetup	2007-08-04 19:04:35 UTC (rev 2687)
@@ -49,7 +49,7 @@
 	${LH_ROOT_COMMAND} ${LH_LOSETUP} "${DEVICE}" "${FILE}"
 else
 	CYLINDERS="`echo "$FDISK_OUT" | sed -ne "s_^$LOOPDEVICE[ *]*\([0-9]*\).*_\1_p"`"
-	OFFSET="`expr ${CYLINDERS} * 512`"
+	OFFSET="`expr ${CYLINDERS} '*' 512`"
 
 	Echo_message "Mounting ${DEVICE} with offset ${OFFSET}"