From 46b661bb79d91adcf36c34b0af6cfa81dda3495a Mon Sep 17 00:00:00 2001
From: Diego Pasqualin <dpasqualin@c3sl.ufpr.br>
Date: Wed, 10 Jul 2013 17:26:37 -0300
Subject: [PATCH] 20-install: Use fakebin/ for all distros
Signed-off-by: Diego Pasqualin <dpasqualin@c3sl.ufpr.br>
---
scripts/20-install | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/scripts/20-install b/scripts/20-install
index 760dc7f..0812c91 100755
--- a/scripts/20-install
+++ b/scripts/20-install
@@ -31,14 +31,8 @@ checkMountedFS || exit 2
loadConf "$PREFIX/conf/$1/create-iso.conf" $1
initChroot
-if [ "$1" == "minicom/server" ] || [ "$1" == "minicom/client" ];
-then
- chroot "$CHROOTDIR" \
- env PATH="/fakebin:$PATH" apt-get -y --force-yes install --purge $(cat "$INSTLIST" | grep -v "^#")
-else
- chroot "$CHROOTDIR" \
- apt-get -y --force-yes install --purge $(cat "$INSTLIST" | grep -v "^#")
-fi
+chroot "$CHROOTDIR" env PATH="/fakebin:$PATH" \
+ apt-get -y --force-yes install --purge $(cat "$INSTLIST" | grep -v "^#")
# The populate-slapd package need to have the ldap (slapd) service running.
# In the previous apt-get command we don't start any services, so we need to
@@ -53,7 +47,7 @@ fi
if [ "$1" == "multiterminal" ]; then
cp -af "$TEMPLATES"/le-installer/le-multiterminal-installer_1.0.8_i386.deb \
"$CHROOTDIR"/tmp/
- chroot "$CHROOTDIR" dpkg -i /tmp/le-multiterminal-installer_1.0.8_i386.deb
+ chroot "$CHROOTDIR" dpkg -i /tmp/le-multiterminal-installer_1.0.8_i386.deb
fi
closeChroot
--
GitLab