fix mdev.conf, add idl4k.cfgreset script

This commit is contained in:
Jaroslav Kysela 2015-08-04 19:42:35 +02:00
parent 8be34f5ace
commit 1e7d16c213
4 changed files with 31 additions and 10 deletions

View File

@ -89,7 +89,7 @@ endef
all: kernel-axe-modules kernel all: kernel-axe-modules kernel
.PHONY: release .PHONY: release
release: kernel-axe-modules out/idl4k.scr out/idl4k.recovery release: kernel-axe-modules out/idl4k.scr out/idl4k.cfgreset out/idl4k.recovery
-ls -la out -ls -la out
.PHONY: dist .PHONY: dist
@ -146,6 +146,11 @@ fs-list:
# uboot # uboot
# #
out/idl4k.cfgreset: patches/uboot-cfgreset.script
$(TOOLPATH)/mkimage -T script -C none \
-n 'Reset satip-axe fw configuration' \
-d patches/uboot-cfgreset.script out/idl4k.cfgreset
out/idl4k.recovery: patches/uboot-recovery.script out/idl4k.recovery: patches/uboot-recovery.script
$(TOOLPATH)/mkimage -T script -C none \ $(TOOLPATH)/mkimage -T script -C none \
-n 'Restore original idl4k fw' \ -n 'Restore original idl4k fw' \

16
dist/README vendored
View File

@ -98,6 +98,13 @@ Misc:
- full tuner reset - "axe-debug reset" - full tuner reset - "axe-debug reset"
Recovery from the wrong configuration:
- copy idl4k.cfgreset file as idl4k.scr file to the root directory on the USB stick
- plug the USB stick to the upper USB port in box
- turn on the box
- the old configuration file is moved to /etc/sysconfig/config.old
Recovery of the original firmware: Recovery of the original firmware:
- copy idl4k.recovery file as idl4k.scr file to the root directory on the USB stick - copy idl4k.recovery file as idl4k.scr file to the root directory on the USB stick
@ -154,6 +161,15 @@ Bugs:
History: History:
-10 -
- replaced stapi / frontend / demuxer drivers with latest from Inverto
- updated kernel USB stack, fixed ftdi_sio kernel oops (mouse readers)
- updated minisatip to new demuxts (reduce CPU usage)
- fixed -b option for minisatip
- updated oscamd to 10937
- fixed /etc/mdev.conf to mount USB sticks without partitions
- added idl4k.cfgreset script to reset wrong config
satip-axe-201505242057-9 - Sun May 24 2015 satip-axe-201505242057-9 - Sun May 24 2015
- added http://boxip:8080/axe-status.txt status page (shell parseable) - added http://boxip:8080/axe-status.txt status page (shell parseable)
- fixed ntpd start - fixed ntpd start

View File

@ -1,10 +1,11 @@
#!/bin/busybox sh #!/bin/busybox sh
busybox mount -t proc proc /proc
AXECFG=$(busybox awk 'match($0, /axecfg=[^ ]*/) {print substr($0,RSTART,RLENGTH)}' /proc/cmdline) AXECFG=$(busybox awk 'match($0, /axecfg=[^ ]*/) {print substr($0,RSTART,RLENGTH)}' /proc/cmdline)
busybox echo "Welcome to SATIP-AXE Linux! $AXECFG" busybox echo "Welcome to SATIP-AXE Linux! $AXECFG"
AXECFG=${AXECFG:7:255} AXECFG=${AXECFG:7:255}
busybox mount -t proc proc /proc
# remount root filesystem in rw mode # remount root filesystem in rw mode
busybox mount -o remount,rw / busybox mount -o remount,rw /
# Create all symbolic links. # Create all symbolic links.
@ -51,14 +52,13 @@ if test "$AXECFG" = "reset"; then
mv /etc/sysconfig/config /etc/sysconfig/config.old 2> /dev/null mv /etc/sysconfig/config /etc/sysconfig/config.old 2> /dev/null
mv /etc/sysconfig/passwd.old /etc/sysconfig/passwd.old1 2> /dev/null mv /etc/sysconfig/passwd.old /etc/sysconfig/passwd.old1 2> /dev/null
mv /etc/sysconfig/passwd /etc/sysconfig/passwd.old 2> /dev/null mv /etc/sysconfig/passwd /etc/sysconfig/passwd.old 2> /dev/null
else fi
if ! test -r /etc/sysconfig/config ; then if ! test -r /etc/sysconfig/config ; then
cp /etc/config.default /etc/sysconfig/config cp /etc/config.default /etc/sysconfig/config
fi fi
if test -r /etc/sysconfig/passwd ; then if test -r /etc/sysconfig/passwd ; then
cp /etc/sysconfig/passwd /etc/passwd cp /etc/sysconfig/passwd /etc/passwd
fi fi
fi
# load config # load config
test -r /etc/sysconfig/config && . /etc/sysconfig/config test -r /etc/sysconfig/config && . /etc/sysconfig/config

View File

@ -1,2 +1,2 @@
-sd[a-h][0-9]{1,2} 0:0 660 */sbin/sd-hotplug.sh -sd[a-h].* 0:0 660 */sbin/sd-hotplug.sh
-ttyUSB[0-9]* 0:0 660 */sbin/tty-hotplug.sh -ttyUSB[0-9]* 0:0 660 */sbin/tty-hotplug.sh