Skip to content
Snippets Groups Projects
Commit 4cca5cd4 authored by Mirko Vogt's avatar Mirko Vogt
Browse files

hot-fix nameclash in sysupgrade: rename pivot() to supivot() in sysupgrade

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.

SVN-Revision: 34815
parent 840d0d24
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ install_bin() { # <file> [ <symlink> ... ] ...@@ -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> [...] ...@@ -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
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment