From f7205b38f8050dbb3e31340de3a643eb880b8df1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 9 Mar 2012 12:25:51 +0200 Subject: [PATCH 1/7] service addons: create lockfile on 'stop' even if service is not runing --- .../transmission/source/bin/transmission.stop | 5 +++-- .../multimedia/hts-tvheadend/source/bin/tvheadend.stop | 5 +++-- .../service/multimedia/vdr-addon/source/bin/vdr.stop | 5 +++-- .../addons/service/softcam/oscam/source/bin/oscam.stop | 7 +++---- packages/addons/service/system/dcron/source/bin/dcron.stop | 5 +++-- .../service/system/pcscd-addon/source/bin/pcscd.stop | 5 +++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop index 0bded7b9b3..2a45c6f384 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.stop @@ -25,8 +25,9 @@ LOCKDIR="/var/lock/" LOCKFILE="transmission.disabled" +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof transmission-daemon)" ];then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall -9 transmission-daemon fi diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop index dc58e7de61..dbf1d9d202 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop +++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.stop @@ -27,8 +27,9 @@ LOCKFILE="tvheadend.disabled" ADDON_BIN="tvheadend" +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof $ADDON_BIN)" ];then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall $ADDON_BIN fi diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop index ede8bcacbb..4cee53ecc3 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.stop @@ -25,9 +25,10 @@ LOCKDIR="/var/lock/" LOCKFILE="vdr.disabled" +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof vdr.bin)" ];then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall vdr.bin fi diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.stop b/packages/addons/service/softcam/oscam/source/bin/oscam.stop index 60349dca5f..c18b32f63f 100755 --- a/packages/addons/service/softcam/oscam/source/bin/oscam.stop +++ b/packages/addons/service/softcam/oscam/source/bin/oscam.stop @@ -26,11 +26,10 @@ LOCKDIR="/var/lock/" LOCKFILE="oscam.disabled" -# use "$(pidof)" instead of $(pidof). otherwise 'if' statement will fail -# because oscam spawns at least one 'extra' process +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof oscam)" ];then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall -9 oscam fi diff --git a/packages/addons/service/system/dcron/source/bin/dcron.stop b/packages/addons/service/system/dcron/source/bin/dcron.stop index 75858a66a7..f93d82434a 100755 --- a/packages/addons/service/system/dcron/source/bin/dcron.stop +++ b/packages/addons/service/system/dcron/source/bin/dcron.stop @@ -25,8 +25,9 @@ LOCKDIR="/var/lock/" LOCKFILE="dcron.disabled" +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof crond)" ]; then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall -9 crond fi diff --git a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop index 4722ea09ff..02d1edd7e2 100755 --- a/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop +++ b/packages/addons/service/system/pcscd-addon/source/bin/pcscd.stop @@ -23,8 +23,9 @@ LOCKDIR="/var/lock/" LOCKFILE="pcscd.disabled" +mkdir -p "$LOCKDIR" +touch "$LOCKDIR/$LOCKFILE" + if [ "$(pidof pcscd.bin)" ];then - mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" killall -9 pcscd.bin fi From 64c96a38e53eac4664f2c48f0e40fdd052157621 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 11 Mar 2012 12:27:28 +0200 Subject: [PATCH 2/7] tvheadend: tvheadend.power: fix sleep & resume --- .../source/sleep.d/tvheadend.power | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power index 1fc9b6f083..70d90fa961 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power +++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power @@ -26,28 +26,27 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend" ADDON_SETTINGS="$ADDON_HOME/settings.xml" REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` -case "$1" in - hibernate|suspend) - if [ "$(pidof tvheadend)" ];then - progress "Shutting down HTS TVHeadend for suspending..." - tvheadend.stop - for module in $REMOVE_MODULES ; do - rmmod -w $module - done - fi - ;; +if [ ! "$REMOVE_MODULES" == "" ] ; then + case "$1" in + hibernate|suspend) + if [ "$(pidof tvheadend)" ];then + progress "Shutting down HTS TVHeadend for suspending..." + tvheadend.stop + for module in $REMOVE_MODULES ; do + rmmod -w $module + done + fi + ;; - thaw|resume) - if [ -f "$LOCKDIR/$LOCKFILE" ];then + thaw|resume) for module in $REMOVE_MODULES ; do modprobe $module done progress "Restarting HTS TVHeadend for wakeup..." xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" & - fi - ;; - - *) exit $NA - ;; -esac + ;; + *) exit $NA + ;; + esac +fi From 1d45f8ff7acb057778bc198247c607bf8c286ca2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 11 Mar 2012 19:33:59 +0200 Subject: [PATCH 3/7] tvheadend: remove 'sleep' from tvheadend.start --- .../service/multimedia/hts-tvheadend/source/bin/tvheadend.start | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start index 2028c5246f..738ed00780 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start @@ -64,6 +64,5 @@ mkdir -p $ADDON_HOME break fi $ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE - sleep 1 done & fi From bda6e3d7d206a8cb7eb264b4bd78f009028ee353 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 11 Mar 2012 19:43:49 +0200 Subject: [PATCH 4/7] tvheadend: revert REMOVE_MODULES sleep/resume logic --- .../source/sleep.d/tvheadend.power | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power index 70d90fa961..b076ca9e9c 100755 --- a/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power +++ b/packages/addons/service/multimedia/hts-tvheadend/source/sleep.d/tvheadend.power @@ -26,27 +26,24 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend" ADDON_SETTINGS="$ADDON_HOME/settings.xml" REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` -if [ ! "$REMOVE_MODULES" == "" ] ; then - case "$1" in - hibernate|suspend) - if [ "$(pidof tvheadend)" ];then - progress "Shutting down HTS TVHeadend for suspending..." - tvheadend.stop - for module in $REMOVE_MODULES ; do - rmmod -w $module - done - fi - ;; - - thaw|resume) +case "$1" in + hibernate|suspend) + if [ "$(pidof tvheadend)" ];then + progress "Shutting down HTS TVHeadend for suspending..." + tvheadend.stop for module in $REMOVE_MODULES ; do - modprobe $module + rmmod -w $module done - progress "Restarting HTS TVHeadend for wakeup..." - xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" & - ;; + fi + ;; - *) exit $NA - ;; - esac -fi + thaw|resume) + for module in $REMOVE_MODULES ; do + modprobe $module + done + progress "Restarting HTS TVHeadend for wakeup..." + xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.hts-tvheadend)" & + ;; + *) exit $NA + ;; +esac From 7a06739ea6f8edb0e447f0dce14373df535af79e Mon Sep 17 00:00:00 2001 From: Viljo Viitanen Date: Mon, 12 Mar 2012 22:59:56 +0200 Subject: [PATCH 5/7] openelec-settings: add samba security to the config ui Signed-off-by: Stefan Saraev --- .../xbmc-addon-settings/config/default_settings.xml | 3 +++ .../source/resources/language/English/strings.xml | 3 +++ .../xbmc-addon-settings/source/resources/settings.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 60181b8f53..8bf4abbde6 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -26,6 +26,9 @@ + + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml index 72c9edc799..b55f353595 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -36,5 +36,8 @@ Samba Boot Start Samba at boot + Use Samba Passwords + Samba Username + Samba Password diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index 3b223be4fb..f09078cb27 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -67,5 +67,8 @@ + + + From d76d833c75bb7b97e1cf4531a2cb59c21b3d17a2 Mon Sep 17 00:00:00 2001 From: Viljo Viitanen Date: Mon, 12 Mar 2012 23:01:03 +0200 Subject: [PATCH 6/7] samba: add smbpasswd Signed-off-by: Stefan Saraev --- packages/network/samba/build | 1 + packages/network/samba/install | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/network/samba/build b/packages/network/samba/build index 6e00127131..6c8ac50e68 100755 --- a/packages/network/samba/build +++ b/packages/network/samba/build @@ -111,6 +111,7 @@ make bin/libsmbclient.so if [ "$SAMBA_SERVER" = yes ]; then make bin/smbd make bin/nmbd + make bin/smbpasswd fi mkdir -p $SYSROOT_PREFIX/usr/lib diff --git a/packages/network/samba/install b/packages/network/samba/install index 3bb6978be1..9777f14b92 100755 --- a/packages/network/samba/install +++ b/packages/network/samba/install @@ -29,6 +29,7 @@ if [ "$SAMBA_SERVER" = "yes" ]; then mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin cp $PKG_BUILD/source3/bin/nmbd $INSTALL/usr/bin + cp $PKG_BUILD/source3/bin/smbpasswd $INSTALL/usr/bin mkdir -p $INSTALL/etc/samba cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba From 9a0d1404d7f2df6cff074cf433c728fa2bb4b479 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 12 Mar 2012 23:06:00 +0200 Subject: [PATCH 7/7] samba: password lock user shares if enabled in openelec config ui Signed-off-by: Stefan Saraev --- packages/network/samba/scripts/52_samba | 40 +++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 9410fe3b13..0c9dbb246e 100644 --- a/packages/network/samba/scripts/52_samba +++ b/packages/network/samba/scripts/52_samba @@ -35,13 +35,49 @@ SMB_USERCONF="/storage/.config/samba.conf" SMB_DEFCONF="/etc/samba/smb.conf" + SMB_CONF="/var/run/smb.conf" + mkdir -p /var/run if [ -f $SMB_USERCONF ]; then - SMB_ARG="--configfile=$SMB_USERCONF" + cp $SMB_USERCONF $SMB_CONF else - SMB_ARG="--configfile=$SMB_DEFCONF" + cp $SMB_DEFCONF $SMB_CONF fi + # only letters & numbers permitted for username & password + SAMBA_USERNAME=`echo $SAMBA_USERNAME | sed "s/[^a-zA-Z0-9]//g;"` + SAMBA_PASSWORD=`echo $SAMBA_PASSWORD | sed "s/[^a-zA-Z0-9]//g;"` + + if [ "$SAMBA_SECURITY" == "true" -a ! "$SAMBA_USERNAME" == "" -a ! "$SAMBA_PASSWORD" == "" ] ; then + # username map: first line makes sure plain root does not work all the time + # processing continues, so if user chooses root as username, second line overrides the first + # this is done always in case user uses passwords in userconf. + # many thanks to viljoviitanen for this + echo -e "$SAMBA_PASSWORD\n$SAMBA_PASSWORD" | smbpasswd -s -a root >/dev/null 2>&1 + echo -e "nobody = root\nroot = $SAMBA_USERNAME" > /var/run/samba.map + + # set public = no + sed -e 's|^.[ \t]*.public.=.*| public = no |' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + # remove username map (if any in userconfig) + sed -e 's|^.[ \t]*.username map.=.*||' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + # set security = share, add username map + sed -e 's|^.[ \t]*.security.=.*| security = user\n username map = /var/run/samba.map|' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + else + # set public = yes + sed -e 's|^.[ \t]*.public.=.*| public = yes |' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + # remove username map (if any in userconfig) + sed -e 's|^.[ \t]*.username map.=.*||' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + # set security = share + sed -e 's|^.[ \t]*.security.=.*| security = share|' $SMB_CONF > $SMB_CONF.tmp && \ + mv $SMB_CONF.tmp $SMB_CONF + fi + + SMB_ARG="--configfile=$SMB_CONF" mkdir -p /var/log/samba nmbd --daemon $SMB_ARG > /dev/null 2>&1 smbd --daemon $SMB_ARG > /dev/null 2>&1