From d4275b65d7cb21e8456f0155bf9b6f8b0f4b262d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 22 Mar 2013 18:58:34 +0200 Subject: [PATCH 1/7] fix typo in create_livestick.bat --- packages/tools/syslinux/files/create_livestick.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/syslinux/files/create_livestick.bat b/packages/tools/syslinux/files/create_livestick.bat index 7a78f839f9..517be5dbd4 100755 --- a/packages/tools/syslinux/files/create_livestick.bat +++ b/packages/tools/syslinux/files/create_livestick.bat @@ -97,7 +97,7 @@ IF ERRORLEVEL 1 goto InvalidDrive >NUL copy README.md %DRIVE% >NUL copy RELEASE %DRIVE% >NUL copy openelec.ico %DRIVE% ->NUL copy 3rdparty/syslinux/vesamenu.c32 %DRIVE% +>NUL copy 3rdparty\syslinux\vesamenu.c32 %DRIVE% >NUL copy splash.png %DRIVE% FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G @@ -200,4 +200,4 @@ ECHO. popd SET DRIVE= SET DRIVEUUID= -PAUSE \ No newline at end of file +PAUSE From d1edf6f772ac2563a5393f4fe6cca7d74725d759 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 22 Mar 2013 18:27:29 +0100 Subject: [PATCH 2/7] oeinstaller, create_livestick*: get rid of white screen during boot --- .../tools/syslinux/files/create_livestick | 4 ++-- .../tools/syslinux/files/create_livestick.bat | 4 ++-- .../tools/syslinux/files/create_livestick.exe | Bin 111005 -> 111020 bytes tools/nsis-installer/oeinstaller.nsi | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) mode change 100755 => 100644 packages/tools/syslinux/files/create_livestick.bat mode change 100755 => 100644 packages/tools/syslinux/files/create_livestick.exe mode change 100755 => 100644 tools/nsis-installer/oeinstaller.nsi diff --git a/packages/tools/syslinux/files/create_livestick b/packages/tools/syslinux/files/create_livestick index 000c2ccac0..6029d601fb 100755 --- a/packages/tools/syslinux/files/create_livestick +++ b/packages/tools/syslinux/files/create_livestick @@ -210,12 +210,12 @@ MENU COLOR tabmsg 31;40 #ff868787 #00000000 std LABEL installer MENU LABEL Run OpenELEC Installer KERNEL /KERNEL - APPEND boot=UUID=$UUID installer quiet + APPEND boot=UUID=$UUID installer quiet vga=current LABEL live MENU LABEL Run OpenELEC Live KERNEL /KERNEL - APPEND boot=UUID=$UUID disk=FILE=STORAGE,512 quiet + APPEND boot=UUID=$UUID disk=FILE=STORAGE,512 quiet vga=current EOF diff --git a/packages/tools/syslinux/files/create_livestick.bat b/packages/tools/syslinux/files/create_livestick.bat old mode 100755 new mode 100644 index 517be5dbd4..37521d2cc3 --- a/packages/tools/syslinux/files/create_livestick.bat +++ b/packages/tools/syslinux/files/create_livestick.bat @@ -133,12 +133,12 @@ ECHO. >> %DRIVE%\syslinux.cfg ECHO LABEL installer >> %DRIVE%\syslinux.cfg ECHO MENU LABEL Run OpenELEC Installer >> %DRIVE%\syslinux.cfg ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg -ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg +ECHO APPEND boot=LABEL=OPENELEC installer quiet vga=current >> %DRIVE%\syslinux.cfg ECHO. >> %DRIVE%\syslinux.cfg ECHO LABEL live >> %DRIVE%\syslinux.cfg ECHO MENU LABEL Run OpenELEC Live >> %DRIVE%\syslinux.cfg ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg -ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,512 quiet >> %DRIVE%\syslinux.cfg +ECHO APPEND boot=LABEL=OPENELEC disk=FILE=STORAGE,512 quiet vga=current >> %DRIVE%\syslinux.cfg GOTO END :InvalidDrive diff --git a/packages/tools/syslinux/files/create_livestick.exe b/packages/tools/syslinux/files/create_livestick.exe old mode 100755 new mode 100644 index 3b15922423fb01228a6dd6a12893573be0511a9e..7355010024c0c72373d5cec80ae4b1c7d492a7bd GIT binary patch delta 11092 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 txE{xK<+9ALc{%=Xko3JXoc? Date: Fri, 22 Mar 2013 20:04:04 +0200 Subject: [PATCH 3/7] xbmc: init: don't write directly to logfile, use 'logger' instead --- packages/mediacenter/xbmc/init.d/93_xbmc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 24d1577b5d..936604ce98 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -39,9 +39,9 @@ fi # starting autostart script (will be removed later again, dont use it!!!) AUTOSTART="/storage/.config/autostart.sh" if [ -f $AUTOSTART ]; then - echo "!!! AUTOSTART script detected !!!" >> /var/log/messages - cat "$AUTOSTART" >> /var/log/messages - echo "!!! -End of autostart script- !!!" >> /var/log/messages + echo '!!! AUTOSTART script detected !!!' | logger -t Boot + cat "$AUTOSTART" | logger -t Boot + echo '!!! -End of autostart script- !!!' | logger -t Boot sh $AUTOSTART fi From 8d68698bdb541f720b646c3e21207c6014501390 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 22 Mar 2013 20:05:06 +0200 Subject: [PATCH 4/7] busybox: implement a custom 'shutdown' script. use with care! closes #2097 --- .../sysutils/busybox/profile.d/safe-shutdown.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/sysutils/busybox/profile.d/safe-shutdown.conf b/packages/sysutils/busybox/profile.d/safe-shutdown.conf index 69710d03a5..dfe7dd7ddf 100644 --- a/packages/sysutils/busybox/profile.d/safe-shutdown.conf +++ b/packages/sysutils/busybox/profile.d/safe-shutdown.conf @@ -27,7 +27,18 @@ omit_pids+=( $@ ) } + _shutdown_script () { + SHUTDOWN="/storage/.config/shutdown.sh" + if [ -f $SHUTDOWN ]; then + echo '!!! SHUTDOWN script detected !!!' | logger -t shutdown.sh + cat "$SHUTDOWN" | logger -t shutdown.sh + echo '!!! -End of shutdown script- !!!' | logger -t shutdown.sh + sh $SHUTDOWN + fi + } + _safe_shutdown () { + _shutdown_script add_omit_pids $(pidof connmand) add_omit_pids $(pidof dbus-daemon) killall5 -15 ${omit_pids[@]/#/-o } From 902ae4a600f2d9d630fed12910c6eecc26e8ba41 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:04:47 +0100 Subject: [PATCH 5/7] busybox: dont start various init scripts in installer mode Signed-off-by: Stephan Raue --- .../busybox/init.d/02_make-directories | 38 ++++++++++--------- .../sysutils/busybox/init.d/06_systemconfig | 2 +- packages/sysutils/busybox/init.d/10_cdrom | 2 +- packages/sysutils/busybox/init.d/23_syslogd | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/packages/sysutils/busybox/init.d/02_make-directories b/packages/sysutils/busybox/init.d/02_make-directories index 096e5b6f64..70c93b066b 100644 --- a/packages/sysutils/busybox/init.d/02_make-directories +++ b/packages/sysutils/busybox/init.d/02_make-directories @@ -38,11 +38,8 @@ progress "make variable directory structure" touch /var/run/utmp chmod 1777 /var/run/utmp -progress "make runtime directory structure" - ln -sf /storage/.config/modprobe.d /run/modprobe.d - progress "make logging directory structure" - if test "$DEBUG" = "yes"; then + if [ ! "$RUNLEVEL" = "installer" -a "$DEBUG" = "yes" ]; then mkdir -p $HOME/log ln -sf $HOME/log /var/log else @@ -52,19 +49,24 @@ progress "make logging directory structure" touch /var/log/wtmp chmod 1777 /var/log/wtmp -progress "make variable library directory structure" -# others: - mkdir -p /var/lib/polkit-1 - chmod 700 /var/lib/polkit-1 - mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d - mkdir -p /var/lib/polkit-1/localauthority/20-org.d - mkdir -p /var/lib/polkit-1/localauthority/30-site.d - mkdir -p /var/lib/polkit-1/localauthority/50-local.d - mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d +if [ ! "$RUNLEVEL" = "installer" ]; then + progress "make runtime directory structure" + ln -sf /storage/.config/modprobe.d /run/modprobe.d - mkdir -p /var/lib/udisks - mkdir -p /var/lib/upower + progress "make variable library directory structure" + # others: + mkdir -p /var/lib/polkit-1 + chmod 700 /var/lib/polkit-1 + mkdir -p /var/lib/polkit-1/localauthority/10-vendor.d + mkdir -p /var/lib/polkit-1/localauthority/20-org.d + mkdir -p /var/lib/polkit-1/localauthority/30-site.d + mkdir -p /var/lib/polkit-1/localauthority/50-local.d + mkdir -p /var/lib/polkit-1/localauthority/90-mandatory.d -progress "make caching directory structure" - mkdir -p $HOME/.cache/bluetooth - ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth + mkdir -p /var/lib/udisks + mkdir -p /var/lib/upower + + progress "make caching directory structure" + mkdir -p $HOME/.cache/bluetooth + ln -sf $HOME/.cache/bluetooth /var/lib/bluetooth +fi diff --git a/packages/sysutils/busybox/init.d/06_systemconfig b/packages/sysutils/busybox/init.d/06_systemconfig index f0b0750dbe..5cbd4a6585 100644 --- a/packages/sysutils/busybox/init.d/06_systemconfig +++ b/packages/sysutils/busybox/init.d/06_systemconfig @@ -27,7 +27,7 @@ OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings if [ -f "$OPENELEC_SETTINGS" ]; then progress "creating system settings" - + mkdir -p /var/config cat "$OPENELEC_SETTINGS" \ | awk -F'["'\'']' '{gsub(/\"\;/, "\\\"", $4); gsub(/\&apos\;/, "\047", $4); gsub(/\&\;/, "\\&", $4); gsub(/\<\;/, "<", $4); gsub(/\>\;/, ">", $4); gsub(/\$/, "\\\$", $4); gsub(/`/, "\\`", $4); print $2"=\""$4"\"";}' \ diff --git a/packages/sysutils/busybox/init.d/10_cdrom b/packages/sysutils/busybox/init.d/10_cdrom index 0b126ec933..e82393990d 100644 --- a/packages/sysutils/busybox/init.d/10_cdrom +++ b/packages/sysutils/busybox/init.d/10_cdrom @@ -21,7 +21,7 @@ # # setup cdrom settings # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode progress "Setup some CDROM settings" sysctl -w dev.cdrom.lock=0 > /dev/null 2>&1 & diff --git a/packages/sysutils/busybox/init.d/23_syslogd b/packages/sysutils/busybox/init.d/23_syslogd index 3eb91fe548..e89918dfce 100644 --- a/packages/sysutils/busybox/init.d/23_syslogd +++ b/packages/sysutils/busybox/init.d/23_syslogd @@ -21,7 +21,7 @@ # # start syslog daemon # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode ( progress "Starting Syslog daemon" From ba3b9844606bfd911ebef2b2354a18c734904658 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:05:28 +0100 Subject: [PATCH 6/7] timezone-data: dont set timezone in installer mode Signed-off-by: Stephan Raue --- packages/sysutils/timezone-data/init.d/03_timezone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/timezone-data/init.d/03_timezone b/packages/sysutils/timezone-data/init.d/03_timezone index 04e49890c0..f976ed46d2 100644 --- a/packages/sysutils/timezone-data/init.d/03_timezone +++ b/packages/sysutils/timezone-data/init.d/03_timezone @@ -21,7 +21,7 @@ # # make variable directory structure # -# runlevels: openelec, installer, textmode +# runlevels: openelec, textmode progress "setting timezone" GUISETTINGS="/storage/.xbmc/userdata/guisettings.xml" From 2737a78b5709a52da48222fd3a26682b69d2882f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 22 Mar 2013 20:21:09 +0100 Subject: [PATCH 7/7] connman: add upstream patch to fix tethering without running dnsproxy Signed-off-by: Stephan Raue --- ..._sure_we_are_not_accessing_null-hash.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch diff --git a/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch b/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch new file mode 100644 index 0000000000..361a4f6bf0 --- /dev/null +++ b/packages/network/connman/patches/connman-dnsproxy_Make_sure_we_are_not_accessing_null-hash.patch @@ -0,0 +1,35 @@ +From 9944240ba52d19f04fb4bf468a8524f570e5fa6d Mon Sep 17 00:00:00 2001 +From: Jukka Rissanen +Date: Fri, 22 Mar 2013 14:15:19 +0000 +Subject: dnsproxy: Make sure we are not accessing null hash + +If dnsproxy is not in use, like when connman has been started +with -r option, then the listener_table will be NULL which can +cause crash in hash table lookup call. +--- +diff --git a/src/dnsproxy.c b/src/dnsproxy.c +index f698cfd..7a9ca91 100644 +--- a/src/dnsproxy.c ++++ b/src/dnsproxy.c +@@ -2916,6 +2916,9 @@ int __connman_dnsproxy_add_listener(int index) + if (index < 0) + return -EINVAL; + ++ if (listener_table == NULL) ++ return 0; ++ + if (g_hash_table_lookup(listener_table, GINT_TO_POINTER(index)) != NULL) + return 0; + +@@ -2947,6 +2950,9 @@ void __connman_dnsproxy_remove_listener(int index) + + DBG("index %d", index); + ++ if (listener_table == NULL) ++ return; ++ + ifdata = g_hash_table_lookup(listener_table, GINT_TO_POINTER(index)); + if (ifdata == NULL) + return; +-- +cgit v0.9.1