emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve --install operation in chroot jails

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-03-06 06:02:31 +01:00
parent 7cfe6ea99e
commit 4a2a86d5e7
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libbb/appletlib.c
View File

@@ -713,12 +713,23 @@ static int busybox_main(char **argv)
if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
int use_symbolic_links;
const char *busybox;
busybox = xmalloc_readlink(bb_busybox_exec_path);
if (!busybox)
busybox = bb_busybox_exec_path;
/* busybox --install [-s] [DIR]: */
/* -s: make symlinks */
/* DIR: directory to install links to */
if (!busybox) {
/* bb_busybox_exec_path is usually "/proc/self/exe".
* In chroot, readlink("/proc/self/exe") usually fails.
* In such case, better use argv[0] as symlink target
* if it is a full path name.
*/
if (argv[0][0] == '/')
busybox = argv[0];
else
busybox = bb_busybox_exec_path;
}
/* busybox --install [-s] [DIR]:
* -s: make symlinks
* DIR: directory to install links to
*/
use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && argv++);
install_links(busybox, use_symbolic_links, argv[2]);
return 0;