diff options
| author | Sebastian Schmelzer | 2009-05-20 20:45:27 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2009-05-20 20:45:27 +0200 |
| commit | 251c6b260b988c460209f499821db03d4d9cd133 (patch) | |
| tree | 680eeb24c40eaf201650d5704ac8ae5d1caf474a | |
| parent | vmchooser update: (diff) | |
| download | core-251c6b260b988c460209f499821db03d4d9cd133.tar.gz core-251c6b260b988c460209f499821db03d4d9cd133.tar.xz core-251c6b260b988c460209f499821db03d4d9cd133.zip | |
update preboot testing
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2861 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | boot-env/preboot/preboot.sh | 2 | ||||
| -rwxr-xr-x | boot-env/preboot/uclib-rootfs/init | 2 | ||||
| l--------- | boot-env/preboot/uclib-rootfs/lib/libcurses.so (renamed from boot-env/preboot/uclib-rootfs/libcurses.so) | 0 | ||||
| l--------- | boot-env/preboot/uclib-rootfs/lib/libncurses.so (renamed from boot-env/preboot/uclib-rootfs/libncurses.so.5) | 0 | ||||
| l--------- | boot-env/preboot/uclib-rootfs/lib/libncurses.so.5 | 1 | ||||
| -rwxr-xr-x | boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 (renamed from boot-env/preboot/uclib-rootfs/libncurses.so.5.6) | bin | 229164 -> 229164 bytes | |||
| l--------- | boot-env/preboot/uclib-rootfs/libncurses.so | 1 |
7 files changed, 4 insertions, 2 deletions
diff --git a/boot-env/preboot/preboot.sh b/boot-env/preboot/preboot.sh index 6c0f5f04..c859f83a 100755 --- a/boot-env/preboot/preboot.sh +++ b/boot-env/preboot/preboot.sh @@ -15,6 +15,8 @@ # get configuration . /etc/initramfs-setup +ash + # we expect to have a system selection dialog file in /preboot/bootmenu.dialog dialog --file bootmenu.dialog 2>result # source the system to boot configuration ($kernel, $initramfs, $append, diff --git a/boot-env/preboot/uclib-rootfs/init b/boot-env/preboot/uclib-rootfs/init index 7018a1e2..cff0d86f 100755 --- a/boot-env/preboot/uclib-rootfs/init +++ b/boot-env/preboot/uclib-rootfs/init @@ -149,7 +149,7 @@ else fi # run the preboot interactive part which finally will execute kexec cd /preboot -exec ./preboot.sh +exec ./preboot.sh || sh # we will never return from that one ... diff --git a/boot-env/preboot/uclib-rootfs/libcurses.so b/boot-env/preboot/uclib-rootfs/lib/libcurses.so index c7b1e02a..c7b1e02a 120000 --- a/boot-env/preboot/uclib-rootfs/libcurses.so +++ b/boot-env/preboot/uclib-rootfs/lib/libcurses.so diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so.5 b/boot-env/preboot/uclib-rootfs/lib/libncurses.so index c7b1e02a..c7b1e02a 120000 --- a/boot-env/preboot/uclib-rootfs/libncurses.so.5 +++ b/boot-env/preboot/uclib-rootfs/lib/libncurses.so diff --git a/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5 b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5 new file mode 120000 index 00000000..c7b1e02a --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5 @@ -0,0 +1 @@ +libncurses.so.5.6
\ No newline at end of file diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 Binary files differindex 00a18be2..00a18be2 100755 --- a/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 +++ b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so b/boot-env/preboot/uclib-rootfs/libncurses.so deleted file mode 120000 index 7257b6af..00000000 --- a/boot-env/preboot/uclib-rootfs/libncurses.so +++ /dev/null @@ -1 +0,0 @@ -libncurses.so.5
\ No newline at end of file |