diff options
| author | Sebastian | 2010-08-22 16:49:26 +0200 |
|---|---|---|
| committer | Sebastian | 2010-08-22 16:49:26 +0200 |
| commit | c7354b9dfff55824edc29833562fb555a50cf48e (patch) | |
| tree | 43b82f4bc86d6ea2f9ff9ce2323d21d0d2c13f0f /initramfs | |
| parent | update busybox (diff) | |
| parent | Incompatibilities with hush, switching back to ash (update should be (diff) | |
| download | core-c7354b9dfff55824edc29833562fb555a50cf48e.tar.gz core-c7354b9dfff55824edc29833562fb555a50cf48e.tar.xz core-c7354b9dfff55824edc29833562fb555a50cf48e.zip | |
Merge branch 'master' of openslx.org:openslx/core
Conflicts:
initramfs/eglibc-rootfs/bin/bash
initramfs/uclib-rootfs/bin/ash
initramfs/uclib-rootfs/bin/hush
Diffstat (limited to 'initramfs')
| -rwxr-xr-x[l---------] | initramfs/eglibc-rootfs/bin/bash | bin | 7 -> 371676 bytes | |||
| l--------- | initramfs/uclib-rootfs/bin/ash | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/initramfs/eglibc-rootfs/bin/bash b/initramfs/eglibc-rootfs/bin/bash Binary files differindex c3fa8102..66be96b6 120000..100755 --- a/initramfs/eglibc-rootfs/bin/bash +++ b/initramfs/eglibc-rootfs/bin/bash diff --git a/initramfs/uclib-rootfs/bin/ash b/initramfs/uclib-rootfs/bin/ash deleted file mode 120000 index c3fa8102..00000000 --- a/initramfs/uclib-rootfs/bin/ash +++ /dev/null @@ -1 +0,0 @@ -busybox
\ No newline at end of file |