X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Fdebian%2Fmodules%2Fy0_install-guestfsd;h=2d895a05e5d5cf0290cf1d8e9b019806716ff212;hb=078fbee4e73036783aefef9401735f8b80e81bb2;hp=c95e4f0d07ac43ca93c0491ebbf0ab335055d014;hpb=0c463dd0aa962c405b1be32c925acf9891c96bfc;p=libguestfs.git

diff --git a/appliance/debian/modules/y0_install-guestfsd b/appliance/debian/modules/y0_install-guestfsd
index c95e4f0..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