From e968eca94ab0087e145da4b08fe9cc3750a6a002 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Feb 2015 22:33:27 +0100 Subject: simplify script, do not create package specific dirs here --- package/kodi/files/kodi.init | 3 +++ scripts/install.sh | 12 +----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index 6dddfd421..51f6604aa 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -12,6 +12,9 @@ autostart) exec sh $0 start ;; start) + if [ -! d /data/kodi ];then + mkdir /data/kodi + fi kodi & ;; stop) diff --git a/scripts/install.sh b/scripts/install.sh index 50ecfc5b0..d38ffe94a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash #- -# Copyright © 2010-2014 +# Copyright © 2010-2015 # Waldemar Brodkorb # Thorsten Glaser # @@ -519,9 +519,6 @@ if (( datafssz )); then mkdir -m0755 "$R"/data ((keep)) || create_fs "$datapart" ADKDATA ext4 ((keep)) || tune_fs "$datapart" - mount_fs "$datapart" "$D" ext4 - mkdir -m0755 "$D/mpd" "$D/kodi" 2>/dev/null - umount_fs "$D" case $target { (raspberry-pi) echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >> "$R"/etc/fstab @@ -535,10 +532,6 @@ fi case $target { (raspberry-pi) mount_fs "$bootpart" "$B" vfat - for x in "$R"/boot/.*; do - [[ -e "$x" ]] && mv -f "$R"/boot/.* "$B/" - break - done for x in "$R"/boot/*; do [[ -e "$x" ]] && mv -f "$R"/boot/* "$B/" break @@ -596,9 +589,6 @@ fi (( quiet )) || print Finishing up... cd "$ADK_TOPDIR" -sync umount_fs "$R" -sync - rm -rf "$T" exit 0 -- cgit v1.2.3