diff --git a/scripts/20-install b/scripts/20-install index 760dc7f05dec94ecf87e8568691a82786f482fa4..0812c912da14972d2171050bd474c004b4b89ae6 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