Changeset 42

Timestamp:

Jun 2, 2014, 2:01:37 PM (10 years ago)

Author:

alloc

Message:

Minor bootstrapper changes

File:

• bootstrapper/bootstrap.sh (modified) (2 diffs)

bootstrapper/bootstrap.sh

@@ -103 +103 @@
         done
         
-        ldconfig -p | grep gcc | grep -v 64 > /dev/null
+        ldconfig -p | grep ld-linux | grep "(ELF)" > /dev/null
         if [ $? -ne 0 ]; then
-                echo "There probably is no 32 Bit version of libgcc installed."
-                echo "Do you want to continue?"
+                echo "WARNING: There probably is no 32 Bit version of ld-linux installed."
+                echo "This is most probably part of a 32 Bit version of a glibc-package."
+                echo "Do you want to continue anyway?"
                 select yn in "Yes" "No"; do
                         case $yn in
@@ -118 +119 @@
                 done
         fi
+
+        ldconfig -p | grep gcc | grep -v 64 > /dev/null
+        if [ $? -ne 0 ]; then
+                echo "WARNING: There probably is no 32 Bit version of libgcc installed."
+                echo "Do you want to continue anyway?"
+                select yn in "Yes" "No"; do
+                        case $yn in
+                                Yes)
+                                        break;;
+                                No)
+                                        echo "Aborting."
+                                        exit 1
+                                        ;;
+                        esac
+                done
+        fi
 }