diff options
| author | joe | 2011-04-20 16:56:00 +0200 |
|---|---|---|
| committer | joe | 2011-04-20 16:56:00 +0200 |
| commit | 534e20811863ef934bbf7758905a3fedcf4c8112 (patch) | |
| tree | c81cf9e4f9e6c382b057e219953ec144e19659ae | |
| parent | autofetch syslinux (diff) | |
| download | usb-boot-stick-534e20811863ef934bbf7758905a3fedcf4c8112.tar.gz usb-boot-stick-534e20811863ef934bbf7758905a3fedcf4c8112.tar.xz usb-boot-stick-534e20811863ef934bbf7758905a3fedcf4c8112.zip | |
vga flag back in, ip config file location read from fbgui.conf
| -rwxr-xr-x | build/rootfs/bin/fbgui | bin | 2366178 -> 2372983 bytes | |||
| -rw-r--r-- | build/rootfs/etc/fbgui.conf | 5 | ||||
| -rwxr-xr-x | build/rootfs/etc/udhcpc.default.script | 11 | ||||
| -rwxr-xr-x | install-usb | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/build/rootfs/bin/fbgui b/build/rootfs/bin/fbgui Binary files differindex 5cc8dc8..aafe3f5 100755 --- a/build/rootfs/bin/fbgui +++ b/build/rootfs/bin/fbgui diff --git a/build/rootfs/etc/fbgui.conf b/build/rootfs/etc/fbgui.conf index 65c38b2..79206b3 100644 --- a/build/rootfs/etc/fbgui.conf +++ b/build/rootfs/etc/fbgui.conf @@ -1,6 +1,7 @@ [default] pbs_url=http://132.230.4.27 -download_directory=/tmp -update_interval=1 +download_directory=/tmp/fbgui +update_interval=5 file_trigger=/tmp/fbgui_trigger serial_location=/serial +ip_config=/tmp/ip_config diff --git a/build/rootfs/etc/udhcpc.default.script b/build/rootfs/etc/udhcpc.default.script index e4f8539..0ea5cd5 100755 --- a/build/rootfs/etc/udhcpc.default.script +++ b/build/rootfs/etc/udhcpc.default.script @@ -14,10 +14,13 @@ case $1 in ip addr add $ip/$(ipcalc -s -p $ip $subnet|sed s/.*=//) dev $interface ip route add default via $router - echo "ip=$ip" > /tmp/kclip - echo "subnet=$subnet" >> /tmp/kclip - echo "broadcast=$broadcast" >> /tmp/kclip - echo "gateway=$router" >> /tmp/kclip + # read filename from fbgui.conf where ip config should be saved. + ipconf=$(cat /etc/fbgui.conf | grep ip_config | cut -d '=' -f2) + + echo "ip=$ip" > $ipconf + echo "subnet=$subnet" >> $ipconf + echo "broadcast=$broadcast" >> $ipconf + echo "gateway=$router" >> $ipconf # Update resolver configuration file R="" diff --git a/install-usb b/install-usb index 39f84cd..5b63c67 100755 --- a/install-usb +++ b/install-usb @@ -49,7 +49,7 @@ 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 + APPEND initrd=init vga=0x317 TEXT HELP Use this (default) entry if you have configured your client. You have chance to edit the kernel commandline by hitting the @@ -58,7 +58,7 @@ LABEL SLXSTDBOOT LABEL DEBUGBOOT MENU LABEL OpenSLX PreBoot - Debug Mode KERNEL kernel - APPEND initrd=init debug=3 + APPEND initrd=init vga=0x317 debug=3 TEXT HELP Use this to start the preboot environment with debug shells. ENDTEXT |