From 251c6b260b988c460209f499821db03d4d9cd133 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Wed, 20 May 2009 18:45:27 +0000
Subject: update preboot testing

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2861 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 boot-env/preboot/preboot.sh                         |   2 ++
 boot-env/preboot/uclib-rootfs/init                  |   2 +-
 boot-env/preboot/uclib-rootfs/lib/libcurses.so      |   1 +
 boot-env/preboot/uclib-rootfs/lib/libncurses.so     |   1 +
 boot-env/preboot/uclib-rootfs/lib/libncurses.so.5   |   1 +
 boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 | Bin 0 -> 229164 bytes
 boot-env/preboot/uclib-rootfs/libcurses.so          |   1 -
 boot-env/preboot/uclib-rootfs/libncurses.so         |   1 -
 boot-env/preboot/uclib-rootfs/libncurses.so.5       |   1 -
 boot-env/preboot/uclib-rootfs/libncurses.so.5.6     | Bin 229164 -> 0 bytes
 10 files changed, 6 insertions(+), 4 deletions(-)
 create mode 120000 boot-env/preboot/uclib-rootfs/lib/libcurses.so
 create mode 120000 boot-env/preboot/uclib-rootfs/lib/libncurses.so
 create mode 120000 boot-env/preboot/uclib-rootfs/lib/libncurses.so.5
 create mode 100755 boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6
 delete mode 120000 boot-env/preboot/uclib-rootfs/libcurses.so
 delete mode 120000 boot-env/preboot/uclib-rootfs/libncurses.so
 delete mode 120000 boot-env/preboot/uclib-rootfs/libncurses.so.5
 delete mode 100755 boot-env/preboot/uclib-rootfs/libncurses.so.5.6

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/lib/libcurses.so b/boot-env/preboot/uclib-rootfs/lib/libcurses.so
new file mode 120000
index 00000000..c7b1e02a
--- /dev/null
+++ b/boot-env/preboot/uclib-rootfs/lib/libcurses.so
@@ -0,0 +1 @@
+libncurses.so.5.6
\ No newline at end of file
diff --git a/boot-env/preboot/uclib-rootfs/lib/libncurses.so b/boot-env/preboot/uclib-rootfs/lib/libncurses.so
new file mode 120000
index 00000000..c7b1e02a
--- /dev/null
+++ b/boot-env/preboot/uclib-rootfs/lib/libncurses.so
@@ -0,0 +1 @@
+libncurses.so.5.6
\ No newline at end of file
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/lib/libncurses.so.5.6 b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6
new file mode 100755
index 00000000..00a18be2
Binary files /dev/null and b/boot-env/preboot/uclib-rootfs/lib/libncurses.so.5.6 differ
diff --git a/boot-env/preboot/uclib-rootfs/libcurses.so b/boot-env/preboot/uclib-rootfs/libcurses.so
deleted file mode 120000
index c7b1e02a..00000000
--- a/boot-env/preboot/uclib-rootfs/libcurses.so
+++ /dev/null
@@ -1 +0,0 @@
-libncurses.so.5.6
\ No newline at end of file
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
diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so.5 b/boot-env/preboot/uclib-rootfs/libncurses.so.5
deleted file mode 120000
index c7b1e02a..00000000
--- a/boot-env/preboot/uclib-rootfs/libncurses.so.5
+++ /dev/null
@@ -1 +0,0 @@
-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/libncurses.so.5.6
deleted file mode 100755
index 00a18be2..00000000
Binary files a/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 and /dev/null differ
-- 
cgit v1.2.3-55-g7522