projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ae0517
)
base-files: remove trailing whitespaces from lib/functions/boot.sh
author
Gabor Juhos
<juhosg@openwrt.org>
Fri, 2 Mar 2012 11:17:30 +0000
(11:17 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Fri, 2 Mar 2012 11:17:30 +0000
(11:17 +0000)
SVN-Revision: 30776
package/base-files/files/lib/functions/boot.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/functions/boot.sh
b/package/base-files/files/lib/functions/boot.sh
index 6bdd7a14903fd98bf361e54eccfabfc7a9bc0382..8c3f27ba4fedbe22097abdf7f5e4486909f650be 100644
(file)
--- a/
package/base-files/files/lib/functions/boot.sh
+++ b/
package/base-files/files/lib/functions/boot.sh
@@
-71,7
+71,7
@@
boot_run_hook() {
find_mtd_part() {
local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
local PREFIX=/dev/mtdblock
find_mtd_part() {
local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
local PREFIX=/dev/mtdblock
-
+
PART="${PART##mtd}"
[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
echo "${PART:+$PREFIX$PART}"
PART="${PART##mtd}"
[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
echo "${PART:+$PREFIX$PART}"
@@
-88,11
+88,11
@@
dupe() { # <new_root> <old_root>
cd $1
echo -n "creating directories... "
{
cd $1
echo -n "creating directories... "
{
- cd $2
+ cd $2
find . -xdev -type d
echo "./dev ./overlay ./mnt ./proc ./tmp"
# xdev skips mounted directories
find . -xdev -type d
echo "./dev ./overlay ./mnt ./proc ./tmp"
# xdev skips mounted directories
- cd $1
+ cd $1
} | xargs mkdir -p
echo "done"
} | xargs mkdir -p
echo "done"
@@
-131,7
+131,7
@@
fopivot() { # <rw_root> <ro_root> <dupe?>
mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
else
mount --bind / /mnt
mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
else
mount --bind / /mnt
- mount --bind -o union "$1" /mnt && root=/mnt
+ mount --bind -o union "$1" /mnt && root=/mnt
fi
} || {
[ "$3" = "1" ] && {
fi
} || {
[ "$3" = "1" ] && {