qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 22:59:40 +02:00
Code

[package/base-files] hot-fix nameclash in sysupgrade: rename pivot() to supivot() in sysupgrade

Browse Source 
Sysupgrade defines its very own pivot() function.
Prior merging boot.sh and functions.sh sysupgrade just included boot.sh,
now it includes functions.sh which defines pivot() as well, however
slightly different which causes sysupgrade to fail.

This is a hot-fix to unbreak sysupgrade, however those two pivot()
functions should actually get merged.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34815 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mirko 2012-12-21 12:10:21 +00:00
parent 170303015d
commit 5ca25ac981
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/files/lib/upgrade/common.sh
View File

@ -33,7 +33,7 @@ install_bin() { # <file> [ <symlink> ... ]
}; done }; done
} }
pivot() { # <new_root> <old_root> supivot() { # <new_root> <old_root>
mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1 mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \ mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
mount -o noatime,move /proc $1/proc && \ mount -o noatime,move /proc $1/proc && \
@ -62,7 +62,7 @@ run_ramfs() { # <command> [...]
done done
install_file /etc/resolv.conf /lib/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA install_file /etc/resolv.conf /lib/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
pivot $RAM_ROOT /mnt || { supivot $RAM_ROOT /mnt || {
echo "Failed to switch over to ramfs. Please reboot." echo "Failed to switch over to ramfs. Please reboot."
exit 1 exit 1
} }