summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2014-11-30 08:47:00 +0100
committerHolger Levsen <holger@layer-acht.org>2014-11-30 10:21:42 +0100
commit2243825acf8c6bef763ec79fdc502aa7f713200c (patch)
treedd9bf18b9389a2a1dddf78fb26865de806acfb47 /bin
parentcdc039917d34357c9de8e49a9800b5f8c7f7bc35 (diff)
downloadjenkins.debian.net-2243825acf8c6bef763ec79fdc502aa7f713200c.tar.xz
g-i: do not run chroot dpkg -l on non-Linux installs
Diffstat (limited to 'bin')
-rw-r--r--bin/g-i-installation.sh26
1 files changed, 16 insertions, 10 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index de808dcf..37e56a46 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1211,19 +1211,25 @@ save_logs() {
#
# get list of installed packages
#
- sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/dpkg-l || { echo "Warning: cannot run dpkg inside the installed system, did the installation finish correctly?" ; export FAILURE=true ; }
- #
- # check for must installed packages
- #
case $NAME in
- *_brltty)
- grep brltty $RESULTS/dpkg-l || { echo "Warning: package brltty not installed." ; export FAILURE=true ; }
- ;;
- *_speakup)
- grep epeakup $RESULTS/dpkg-l || { echo "Warning: package espeakup not installed." ; export FAILURE=true ; }
+ *_kfreebsd*|*_hurd*)
;;
*)
- ;;
+ sudo chroot $SYSTEM_MNT dpkg -l > $RESULTS/dpkg-l || { echo "Warning: cannot run dpkg inside the installed system, did the installation finish correctly?" ; export FAILURE=true ; }
+ #
+ # check for must installed packages
+ #
+ case $NAME in
+ *_brltty)
+ grep brltty $RESULTS/dpkg-l || { echo "Warning: package brltty not installed." ; export FAILURE=true ; }
+ ;;
+ *_speakup)
+ grep epeakup $RESULTS/dpkg-l || { echo "Warning: package espeakup not installed." ; export FAILURE=true ; }
+ ;;
+ *)
+ ;;
+ esac
+ ;;
esac
#