summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoe2011-04-20 14:57:10 +0200
committerjoe2011-04-20 14:57:10 +0200
commit2553131c6a6f508a207756a00763d1ed1281abfb (patch)
tree7b87bbc202d9d028683a2848b1631caee635af8e
parentfbgui update (diff)
downloadusb-boot-stick-2553131c6a6f508a207756a00763d1ed1281abfb.tar.gz
usb-boot-stick-2553131c6a6f508a207756a00763d1ed1281abfb.tar.xz
usb-boot-stick-2553131c6a6f508a207756a00763d1ed1281abfb.zip
fixes...
-rw-r--r--build/initramfs-defaultbin65189518 -> 24393052 bytes
-rwxr-xr-xbuild/rootfs/bin/fbguibin2448287 -> 2366178 bytes
-rwxr-xr-xbuild/rootfs/bin/load_fbgui.sh4
-rw-r--r--build/rootfs/etc/fbgui.conf4
-rwxr-xr-xbuild/rootfs/init7
-rwxr-xr-xbuild/rootfs/lib/i386-linux-gnu/libc.so.6bin0 -> 1434180 bytes
-rw-r--r--build/rootfs/lib/i386-linux-gnu/libdl.so.2bin0 -> 9736 bytes
-rw-r--r--build/rootfs/lib/i386-linux-gnu/libgcc_s.so.1bin0 -> 108040 bytes
-rw-r--r--build/rootfs/lib/i386-linux-gnu/libm.so.6bin0 -> 149392 bytes
-rwxr-xr-xbuild/rootfs/lib/i386-linux-gnu/libpthread.so.0bin0 -> 121644 bytes
-rw-r--r--build/rootfs/lib/i386-linux-gnu/librt.so.1bin0 -> 30684 bytes
-rw-r--r--build/rootfs/lib/libusb-1.0.so.0bin46592 -> 46592 bytes
-rw-r--r--build/rootfs/usr/lib/i386-linux-gnu/libstdc++.so.6bin0 -> 930044 bytes
-rw-r--r--build/rootfs/usr/lib/libqjson.so.0bin120800 -> 128948 bytes
-rwxr-xr-xbuild/rootfs/usr/local/Qxt/lib/libQxtCore.so.0bin0 -> 548912 bytes
-rwxr-xr-xbuild/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4bin2798840 -> 2708888 bytes
-rwxr-xr-xbuild/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4bin9727440 -> 9666992 bytes
-rwxr-xr-xbuild/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4bin844848 -> 762960 bytes
-rwxr-xr-xbuild/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4bin16009368 -> 16394360 bytes
-rwxr-xr-xbuild/rootfs/usr/local/lib/libsysfs.so.2bin0 -> 132737 bytes
-rwxr-xr-xinstall-usb10
21 files changed, 18 insertions, 7 deletions
diff --git a/build/initramfs-default b/build/initramfs-default
index d88f4ca..b7c6468 100644
--- a/build/initramfs-default
+++ b/build/initramfs-default
Binary files differ
diff --git a/build/rootfs/bin/fbgui b/build/rootfs/bin/fbgui
index 3c95171..5cc8dc8 100755
--- a/build/rootfs/bin/fbgui
+++ b/build/rootfs/bin/fbgui
Binary files differ
diff --git a/build/rootfs/bin/load_fbgui.sh b/build/rootfs/bin/load_fbgui.sh
index f4f2fc1..2624196 100755
--- a/build/rootfs/bin/load_fbgui.sh
+++ b/build/rootfs/bin/load_fbgui.sh
@@ -10,12 +10,12 @@ fbgui_options=""
[ $DEBUGLEVEL -ge 1 ] && /bin/sh
. /tmp/kclip
-kcl=$(cat /tmp/fbgui/kcl)
+kcl=$(cat /tmp/kcl)
kcl="$kcl ip=$ip:10.8.4.3:$gateway:$subnet"
echo "KCL: $kcl"
echo "\n\n Run kexec"
-kexec -l /tmp/fbgui/kernel --initrd=/tmp/fbgui/initramfs --append="$kcl"
+kexec -l /tmp/kernel --initrd=/tmp/initramfs --append="$kcl"
kexec -e
diff --git a/build/rootfs/etc/fbgui.conf b/build/rootfs/etc/fbgui.conf
index e450443..65c38b2 100644
--- a/build/rootfs/etc/fbgui.conf
+++ b/build/rootfs/etc/fbgui.conf
@@ -1,6 +1,6 @@
[default]
pbs_url=http://132.230.4.27
-download_directory=/tmp/fbgui
-update_interval=5
+download_directory=/tmp
+update_interval=1
file_trigger=/tmp/fbgui_trigger
serial_location=/serial
diff --git a/build/rootfs/init b/build/rootfs/init
index faec9ad..523f260 100755
--- a/build/rootfs/init
+++ b/build/rootfs/init
@@ -6,6 +6,11 @@
# device files get their own filesystem
devdir="/dev"
+
+mkdir -p /tmp
+mkdir -p /sys
+mkdir -p /proc
+
mount -n -t tmpfs -o 'size=25%,mode=0755' mdev ${devdir}
mount -t tmpfs tmpfs /tmp
mkdir -p /dev/pts
@@ -92,7 +97,7 @@ cat /etc/issue
#ntbdate time.uni-freiburg.de
if [ $DEBUGLEVEL -ge 1 ]; then
-echo "\$DEBUGLEVEL=$DEBUGLEVEL" > /tmp/debuglevel
+echo "DEBUGLEVEL=$DEBUGLEVEL" > /tmp/debuglevel
echo "starting debug shell: "
/bin/sh
fi
diff --git a/build/rootfs/lib/i386-linux-gnu/libc.so.6 b/build/rootfs/lib/i386-linux-gnu/libc.so.6
new file mode 100755
index 0000000..9d125cd
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/libc.so.6
Binary files differ
diff --git a/build/rootfs/lib/i386-linux-gnu/libdl.so.2 b/build/rootfs/lib/i386-linux-gnu/libdl.so.2
new file mode 100644
index 0000000..02dab36
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/libdl.so.2
Binary files differ
diff --git a/build/rootfs/lib/i386-linux-gnu/libgcc_s.so.1 b/build/rootfs/lib/i386-linux-gnu/libgcc_s.so.1
new file mode 100644
index 0000000..50bbcf9
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/libgcc_s.so.1
Binary files differ
diff --git a/build/rootfs/lib/i386-linux-gnu/libm.so.6 b/build/rootfs/lib/i386-linux-gnu/libm.so.6
new file mode 100644
index 0000000..d791009
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/libm.so.6
Binary files differ
diff --git a/build/rootfs/lib/i386-linux-gnu/libpthread.so.0 b/build/rootfs/lib/i386-linux-gnu/libpthread.so.0
new file mode 100755
index 0000000..d4ebcbf
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/libpthread.so.0
Binary files differ
diff --git a/build/rootfs/lib/i386-linux-gnu/librt.so.1 b/build/rootfs/lib/i386-linux-gnu/librt.so.1
new file mode 100644
index 0000000..89de1b4
--- /dev/null
+++ b/build/rootfs/lib/i386-linux-gnu/librt.so.1
Binary files differ
diff --git a/build/rootfs/lib/libusb-1.0.so.0 b/build/rootfs/lib/libusb-1.0.so.0
index 6b1b557..41a1165 100644
--- a/build/rootfs/lib/libusb-1.0.so.0
+++ b/build/rootfs/lib/libusb-1.0.so.0
Binary files differ
diff --git a/build/rootfs/usr/lib/i386-linux-gnu/libstdc++.so.6 b/build/rootfs/usr/lib/i386-linux-gnu/libstdc++.so.6
new file mode 100644
index 0000000..2dce5c6
--- /dev/null
+++ b/build/rootfs/usr/lib/i386-linux-gnu/libstdc++.so.6
Binary files differ
diff --git a/build/rootfs/usr/lib/libqjson.so.0 b/build/rootfs/usr/lib/libqjson.so.0
index 8344f7f..15fdd2e 100644
--- a/build/rootfs/usr/lib/libqjson.so.0
+++ b/build/rootfs/usr/lib/libqjson.so.0
Binary files differ
diff --git a/build/rootfs/usr/local/Qxt/lib/libQxtCore.so.0 b/build/rootfs/usr/local/Qxt/lib/libQxtCore.so.0
new file mode 100755
index 0000000..e3342d4
--- /dev/null
+++ b/build/rootfs/usr/local/Qxt/lib/libQxtCore.so.0
Binary files differ
diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4
index c77d481..51f04ff 100755
--- a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4
+++ b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtCore.so.4
Binary files differ
diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4
index 75c5ad2..45f9f8a 100755
--- a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4
+++ b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtGui.so.4
Binary files differ
diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4
index e3bbb86..2cdb670 100755
--- a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4
+++ b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtNetwork.so.4
Binary files differ
diff --git a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4 b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4
index 759e272..040cd2e 100755
--- a/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4
+++ b/build/rootfs/usr/local/Trolltech/QtEmbedded-4.7.2/lib/libQtWebKit.so.4
Binary files differ
diff --git a/build/rootfs/usr/local/lib/libsysfs.so.2 b/build/rootfs/usr/local/lib/libsysfs.so.2
new file mode 100755
index 0000000..cdefdad
--- /dev/null
+++ b/build/rootfs/usr/local/lib/libsysfs.so.2
Binary files differ
diff --git a/install-usb b/install-usb
index 9f88259..49c1a62 100755
--- a/install-usb
+++ b/install-usb
@@ -47,13 +47,19 @@ MENU TITLE Welcome to OpenSLX PreBoot USB Ext2/3 (Mini Linux/Kexec)
LABEL SLXSTDBOOT
MENU LABEL OpenSLX PreBoot - Stateless Netboot Linux ...
KERNEL kernel
- APPEND initrd=init vga=0x317
+ APPEND initrd=init
TEXT HELP
Use this (default) entry if you have configured your client.
You have chance to edit the kernel commandline by hitting the
TAB key (e.g. for adding debug=3 to it for bug hunting) ...
ENDTEXT
-
+LABEL DEBUGBOOT
+ MENU LABEL OpenSLX PreBoot - Debug Mode
+ KERNEL kernel
+ APPEND initrd=init debug=3
+ TEXT HELP
+ Use this to start the preboot environment with debug shells.
+ ENDTEXT
LABEL LOCALBOOT
MENU LABEL LOCALBOOT
LOCALBOOT -1