X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Fdebian%2Fmodules%2Fy0_install-guestfsd;h=2d895a05e5d5cf0290cf1d8e9b019806716ff212;hp=17bbbdc0c46d70f2a9ad664eb1b4779cfcdf8154;hb=4312988e0e3acc1f641b70072141916d03623570;hpb=bcd7bd3aabf4a28bca24bf5d22ed3a68322ec637

diff --git a/appliance/debian/modules/y0_install-guestfsd b/appliance/debian/modules/y0_install-guestfsd
index 17bbbdc..2d895a0 100755
--- a/appliance/debian/modules/y0_install-guestfsd
+++ b/appliance/debian/modules/y0_install-guestfsd
@@ -13,11 +13,19 @@ exec 5<&-
 echo "Module whitelist: $whitelist"
 find $DEBIRF_ROOT/lib/modules/*/kernel -name '*.ko' $whitelist -a -exec rm '{}' \;
 
-# install additional packages:
-PKGLIST=$(< packagelist)
+# install additional packages from the package list, but
+# only ones which exist in the repository
+PKGLIST=
+for pkg in $(< packagelist); do
+  if [ "$(debirf_exec apt-get -s install $pkg 3>&1 1>&2 2>&3 1>&- | grep '^E:' | wc -l)" -gt 0 ]; then
+    echo "Ignoring package $pkg, because it was not found in this repository."
+  else
+    PKGLIST="$PKGLIST $pkg"
+  fi
+done
 echo "Will add $PKGLIST"
-debirf_exec aptitude -R -y install $PKGLIST
-debirf_exec aptitude -y remove vim-tiny dhcp3-client iptables
+debirf_exec apt-get --assume-yes install $PKGLIST
+debirf_exec apt-get --assume-yes remove vim-tiny dhcp3-client iptables
 
 debirf_exec mkdir -p --mode=0777 /sysroot
 
@@ -30,4 +38,3 @@ rm -rf "$DEBIRF_ROOT"/usr/share/man/
 echo $PWD
 install -o root -g root -m 0755 ../daemon/guestfsd "$DEBIRF_ROOT"/sbin/guestfsd
 install -o root -g root -m 0755 init "$DEBIRF_ROOT"/sbin/init
-