diff options
| author | Oliver Tappe | 2008-02-04 01:21:49 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2008-02-04 01:21:49 +0100 |
| commit | e9d8d18571c5c088c963a199984cd80c637d8ee9 (patch) | |
| tree | 49f009cca42ac23c7869597b05a84d5a9ff64ad6 /tools/busybox-patches/unionfs-run-init-1.8.2.diff | |
| parent | * cleaned up the code a bit with respect to the handling of target systems (diff) | |
| download | core-e9d8d18571c5c088c963a199984cd80c637d8ee9.tar.gz core-e9d8d18571c5c088c963a199984cd80c637d8ee9.tar.xz core-e9d8d18571c5c088c963a199984cd80c637d8ee9.zip | |
* updated busybox to 1.8.2
* added new applet vncpasswd to busybox which creates a password suitable
for vnc (original code from Sebastian, slightly modified by me)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1515 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'tools/busybox-patches/unionfs-run-init-1.8.2.diff')
| -rw-r--r-- | tools/busybox-patches/unionfs-run-init-1.8.2.diff | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/busybox-patches/unionfs-run-init-1.8.2.diff b/tools/busybox-patches/unionfs-run-init-1.8.2.diff new file mode 100644 index 00000000..768e07c6 --- /dev/null +++ b/tools/busybox-patches/unionfs-run-init-1.8.2.diff @@ -0,0 +1,14 @@ +diff -ruw busybox-1.6.1/util-linux/switch_root.c busybox-1.6.1-openslx/util-linux/switch_root.c +--- busybox-1.6.1/util-linux/switch_root.c 2007-06-30 17:06:48.000000000 +0200 ++++ busybox-1.6.1-openslx/util-linux/switch_root.c 2007-08-03 18:52:59.000000000 +0200 +@@ -105,6 +105,10 @@ + // Overmount / with newdir and chroot into it. The chdir is needed to + // recalculate "." and ".." links. + ++ if ( !lstat("/rorootfs", &st1 ) ) ++ if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) ) ++ bb_error_msg_and_die("moving rorootfs"); ++ + if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".")) + bb_error_msg_and_die("error moving root"); + xchdir("/"); |