Better handling of fuse in chroot

src/scripts/enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to enter the chroot environment
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 47 matching lines @@
 fi
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 # TODO: replace shflags with something less error-prone, or contribute a fix.
 set -e
 
 INNER_CHROME_ROOT="/home/$USER/chrome_root"  # inside chroot
 CHROME_ROOT_CONFIG="/var/cache/chrome_root"  # inside chroot
 INNER_DEPOT_TOOLS_ROOT="/home/$USER/depot_tools"  # inside chroot
-KERNEL_MODULES_ROOT="/lib/modules/$( uname -r )" # inside and outside chroot
 FUSE_DEVICE="/dev/fuse"
 
 sudo chmod 0777 "$FLAGS_chroot/var/lock"
 
 LOCKFILE="$FLAGS_chroot/var/lock/enter_chroot"
 
 function setup_env {
   (
     flock 200
     echo $$ >> "$LOCKFILE"
@@ skipping 55 matching lines @@
     then
       if [ $(which gclient 2>/dev/null) ]; then
         echo "Mounting depot_tools"
         DEPOT_TOOLS=$(dirname $(which gclient) )
         mkdir -p "$MOUNTED_PATH"
         if ! sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"; then
           echo "depot_tools failed to mount; perhaps it's on NFS?"
           echo "This may impact chromium build."
         fi
       fi
-    fi    
-        
+    fi
+
     # Mount fuse device from host machine into chroot and copy over
     # corresponding kernel modules.
     MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${FUSE_DEVICE}")"

[adlr, 2010/04/05 23:31:31]

can you remove the call to readlink? readlink will return empty string if the
path doesn't exist.

also, should you mkdir -p the path?

[sosa, 2010/04/05 23:41:40]

readlink -f only checks the directory, not the last part ... and it /dev is
missing, the chroot is broken anyway

On 2010/04/05 23:31:31, adlr wrote:

     if [ -z "$(mount | grep -F "on ${MOUNTED_PATH} ")" ] && \
       [ -c "${FUSE_DEVICE}" ] ; then
-      if [ -c "${FUSE_DEVICE}" ] ; then
-        echo "Mounting fuse device"      
-        sudo touch "${MOUNTED_PATH}"
-        sudo mount --bind "${FUSE_DEVICE}" "${MOUNTED_PATH}"               
-        INNER_MOD_PATH="$(readlink -f "${FLAGS_chroot}${KERNEL_MODULES_ROOT}")"    
-        if [ ! -f "${INNER_MOD_PATH}/modules.dep" ] ; then
-          sudo mkdir -p "${INNER_MOD_PATH}/kernel/fs/fuse"
-          sudo cp -fu "${KERNEL_MODULES_ROOT}/modules.dep" "${INNER_MOD_PATH}"
-          if [ -f "${KERNEL_MODULES_ROOT}/kernel/fs/fuse/fuse.ko" ] ; then
-            sudo cp -fu "${KERNEL_MODULES_ROOT}/kernel/fs/fuse/fuse.ko" \
-              "${INNER_MOD_PATH}/kernel/fs/fuse"
-          else
-            echo "Warning:  Fuse device found but no modules for running kernel"
-            echo "gmergefs will not work"
-          fi
-        fi        
-      else
-        echo "Warning:  Fuse device not found.  gmergefs will not work"
-      fi
-    fi                    
-        
+      echo "Attempting to mount fuse device for gmergefs"
+      sudo touch "${MOUNTED_PATH}"
+      sudo mount --bind "${FUSE_DEVICE}" "${MOUNTED_PATH}"
+      sudo modprobe fuse 2> /dev/null ||\
+        echo "-- Note: modprobe fuse failed.  gmergefs will not work"
+    fi
+
   ) 200>>"$LOCKFILE" || die "setup_env failed"
 }
 
 function teardown_env {
   # Only teardown if we're the last enter_chroot to die
   (
     flock 200
 
     # check each pid in $LOCKFILE to see if it's died unexpectedly
     TMP_LOCKFILE="$LOCKFILE.tmp"
@@ skipping 78 matching lines @@
 
 # Run command or interactive shell.  Also include the non-chrooted path to
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
   EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env