diff options
| author | Dirk von Suchodoletz | 2010-08-22 19:43:24 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-08-22 19:43:24 +0200 |
| commit | 8f18849308443e2fc6bc2e76a9f2d511e2c5f156 (patch) | |
| tree | 618d4960328d34974bff6c35b4f8f6ecbf5b5570 | |
| parent | Removing unneeded stuff from Ubuntu configuration, changing tempfs (diff) | |
| parent | fix bad libm (diff) | |
| download | core-8f18849308443e2fc6bc2e76a9f2d511e2c5f156.tar.gz core-8f18849308443e2fc6bc2e76a9f2d511e2c5f156.tar.xz core-8f18849308443e2fc6bc2e76a9f2d511e2c5f156.zip | |
Merge branch 'master' of openslx.org:openslx/core
| -rw-r--r-- | initramfs/eglibc-rootfs/lib/libm.so.6 | bin | 0 -> 149392 bytes | |||
| -rw-r--r-- | initramfs/eglibc-rootfs/usr/lib/libfusion-1.2.so.9 (renamed from os-plugins/plugins/bootsplash/files/usr/lib/libfusion-1.2.so.9) | bin | 32432 -> 32432 bytes | |||
| -rw-r--r-- | initramfs/eglibc-rootfs/usr/lib/libgcc_s.so.1 (renamed from os-plugins/plugins/bootsplash/files/usr/lib/libgcc_s.so.1) | bin | 116600 -> 116600 bytes | |||
| l--------- | initramfs/eglibc-rootfs/usr/lib/libm.so | 1 | ||||
| -rw-r--r-- | initramfs/eglibc-rootfs/usr/lib/libpcre.so.3 (renamed from os-plugins/plugins/bootsplash/files/usr/lib/libpcre.so.3) | bin | 194216 -> 194216 bytes | |||
| -rw-r--r-- | initramfs/uclib-rootfs/lib/libm.so.6 | bin | 0 -> 149392 bytes | |||
| -rw-r--r-- | initramfs/uclib-rootfs/usr/lib/libfusion-1.2.so.9 | bin | 0 -> 32432 bytes | |||
| -rw-r--r-- | initramfs/uclib-rootfs/usr/lib/libgcc_s.so.1 | bin | 0 -> 116600 bytes | |||
| l--------- | initramfs/uclib-rootfs/usr/lib/libm.so | 1 | ||||
| -rw-r--r-- | initramfs/uclib-rootfs/usr/lib/libpcre.so.3 | bin | 0 -> 194216 bytes | |||
| -rw-r--r-- | os-plugins/OpenSLX/OSPlugin/Engine.pm | 2 |
11 files changed, 3 insertions, 1 deletions
diff --git a/initramfs/eglibc-rootfs/lib/libm.so.6 b/initramfs/eglibc-rootfs/lib/libm.so.6 Binary files differnew file mode 100644 index 00000000..0e557bfe --- /dev/null +++ b/initramfs/eglibc-rootfs/lib/libm.so.6 diff --git a/os-plugins/plugins/bootsplash/files/usr/lib/libfusion-1.2.so.9 b/initramfs/eglibc-rootfs/usr/lib/libfusion-1.2.so.9 Binary files differindex 1b8d84ea..1b8d84ea 100644 --- a/os-plugins/plugins/bootsplash/files/usr/lib/libfusion-1.2.so.9 +++ b/initramfs/eglibc-rootfs/usr/lib/libfusion-1.2.so.9 diff --git a/os-plugins/plugins/bootsplash/files/usr/lib/libgcc_s.so.1 b/initramfs/eglibc-rootfs/usr/lib/libgcc_s.so.1 Binary files differindex f893c04d..f893c04d 100644 --- a/os-plugins/plugins/bootsplash/files/usr/lib/libgcc_s.so.1 +++ b/initramfs/eglibc-rootfs/usr/lib/libgcc_s.so.1 diff --git a/initramfs/eglibc-rootfs/usr/lib/libm.so b/initramfs/eglibc-rootfs/usr/lib/libm.so new file mode 120000 index 00000000..6c7b429c --- /dev/null +++ b/initramfs/eglibc-rootfs/usr/lib/libm.so @@ -0,0 +1 @@ +/lib/libm.so.6
\ No newline at end of file diff --git a/os-plugins/plugins/bootsplash/files/usr/lib/libpcre.so.3 b/initramfs/eglibc-rootfs/usr/lib/libpcre.so.3 Binary files differindex d11113bb..d11113bb 100644 --- a/os-plugins/plugins/bootsplash/files/usr/lib/libpcre.so.3 +++ b/initramfs/eglibc-rootfs/usr/lib/libpcre.so.3 diff --git a/initramfs/uclib-rootfs/lib/libm.so.6 b/initramfs/uclib-rootfs/lib/libm.so.6 Binary files differnew file mode 100644 index 00000000..0e557bfe --- /dev/null +++ b/initramfs/uclib-rootfs/lib/libm.so.6 diff --git a/initramfs/uclib-rootfs/usr/lib/libfusion-1.2.so.9 b/initramfs/uclib-rootfs/usr/lib/libfusion-1.2.so.9 Binary files differnew file mode 100644 index 00000000..1b8d84ea --- /dev/null +++ b/initramfs/uclib-rootfs/usr/lib/libfusion-1.2.so.9 diff --git a/initramfs/uclib-rootfs/usr/lib/libgcc_s.so.1 b/initramfs/uclib-rootfs/usr/lib/libgcc_s.so.1 Binary files differnew file mode 100644 index 00000000..f893c04d --- /dev/null +++ b/initramfs/uclib-rootfs/usr/lib/libgcc_s.so.1 diff --git a/initramfs/uclib-rootfs/usr/lib/libm.so b/initramfs/uclib-rootfs/usr/lib/libm.so new file mode 120000 index 00000000..6c7b429c --- /dev/null +++ b/initramfs/uclib-rootfs/usr/lib/libm.so @@ -0,0 +1 @@ +/lib/libm.so.6
\ No newline at end of file diff --git a/initramfs/uclib-rootfs/usr/lib/libpcre.so.3 b/initramfs/uclib-rootfs/usr/lib/libpcre.so.3 Binary files differnew file mode 100644 index 00000000..d11113bb --- /dev/null +++ b/initramfs/uclib-rootfs/usr/lib/libpcre.so.3 diff --git a/os-plugins/OpenSLX/OSPlugin/Engine.pm b/os-plugins/OpenSLX/OSPlugin/Engine.pm index 4fbf3209..25827205 100644 --- a/os-plugins/OpenSLX/OSPlugin/Engine.pm +++ b/os-plugins/OpenSLX/OSPlugin/Engine.pm @@ -673,7 +673,7 @@ sub _callChrootedFunctionForPlugin acquire => sub { # bind mount perl includes, openslx base and config paths into vendor-OS foreach (@bindmounts) { - slxsystem("mount -o bind -o ro $_->{'source'} $_->{'target'}") == 0 + slxsystem("mount -o bind $_->{'source'} $_->{'target'}") == 0 or die _tr( "unable to bind mount '%s' to '%s'! (%s)", $_->{'source'}, $_->{'target'}, $! |