Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: src/platform/dev/gmergefs

Issue 2037006: Fix modprobe prob in gmergefs and bring call script into scripts (Closed) Base URL: ssh://git@chromiumos-git//chromeos
Patch Set: Check Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/scripts/gmergefs » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Script that emerges packages and their dependencies from a host development 7 # Script that emerges packages and their dependencies from a host development
8 # machine onto a target Chromium OS device 8 # machine onto a target Chromium OS device
9 # 9 #
10 # NOTE: This script must be run from the chromiumos build chroot environment. 10 # NOTE: This script must be run from the chromiumos build chroot environment.
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 # Clean up function for mount point 57 # Clean up function for mount point
58 cleanup_sshfs_mount() { 58 cleanup_sshfs_mount() {
59 echo "Cleaning up mount point" 59 echo "Cleaning up mount point"
60 sudo umount "${REMOTE_ROOT_DIR}" 60 sudo umount "${REMOTE_ROOT_DIR}"
61 } 61 }
62 62
63 check_args "${FLAGS_board}" 63 check_args "${FLAGS_board}"
64 check_args "${FLAGS_ARGV}" "Emerge package name" 64 check_args "${FLAGS_ARGV}" "Emerge package name"
65 65
66 # Just in case we haven't done this before.
67 eval /sbin/modprobe fuse
68
69 EMERGE_FLAGS="" 66 EMERGE_FLAGS=""
70 [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]] && 67 [[ $FLAGS_usepkg -eq $FLAGS_TRUE ]] &&
71 EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg --usepkg --with-bdeps y" 68 EMERGE_FLAGS="${EMERGE_FLAGS} --getbinpkg --usepkg --with-bdeps y"
72 69
73 INSTALL_MASK="" 70 INSTALL_MASK=""
74 [[ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ]] && \ 71 [[ ${FLAGS_installmask} -eq ${FLAGS_TRUE} ]] && \
75 INSTALL_MASK="${DEFAULT_INSTALL_MASK}" 72 INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
76 73
77 EMERGE_JOBS= 74 EMERGE_JOBS=
78 [[ ${FLAGS_jobs} -ne -1 ]] && EMERGE_JOBS="--jobs=${FLAGS_jobs}" 75 [[ ${FLAGS_jobs} -ne -1 ]] && EMERGE_JOBS="--jobs=${FLAGS_jobs}"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 # Update ld.so.cache of root partition if installing to /usr/local 125 # Update ld.so.cache of root partition if installing to /usr/local
129 if [ ${FLAGS_onstatefuldev} -eq $FLAGS_TRUE ] ; then 126 if [ ${FLAGS_onstatefuldev} -eq $FLAGS_TRUE ] ; then
130 # Re-run ldconfig to fix /etc/ldconfig.so.cache 127 # Re-run ldconfig to fix /etc/ldconfig.so.cache
131 sudo /sbin/ldconfig -r "${REMOTE_ROOT_DIR}" 128 sudo /sbin/ldconfig -r "${REMOTE_ROOT_DIR}"
132 fi 129 fi
133 130
134 sync 131 sync
135 sudo umount "${REMOTE_ROOT_DIR}" 132 sudo umount "${REMOTE_ROOT_DIR}"
136 133
137 trap - EXIT 134 trap - EXIT
OLDNEW
« no previous file with comments | « no previous file | src/scripts/gmergefs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698