summaryrefslogtreecommitdiffstats
path: root/abs/core/linhes-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/linhes-scripts')
-rw-r--r--abs/core/linhes-scripts/PKGBUILD6
-rw-r--r--abs/core/linhes-scripts/acl_fix_fstab.py64
-rw-r--r--abs/core/linhes-scripts/linhes-scripts.install7
3 files changed, 2 insertions, 75 deletions
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index e78d857..0c81167 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=54
+pkgrel=55
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -39,7 +39,6 @@ qip7100-cc.sh
dtheme.sh
upgrade_screen_rc
upgrade_linhes_script.sh
-acl_fix_fstab.py
stop_xss.sh
myth2mkv
LinHES-osd
@@ -51,7 +50,7 @@ package() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -d ${pkgdir}/usr/LH/etc
- install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
+ install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -89,7 +88,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'35693f50939d5827aeabfce8c5dce589'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
- 'cc9cdabcdfc969c2829b58c0e513488c'
'54a478660d0f8150fe10112a9ecf2740'
'503df99218373dfc75e7e7f5e449a44e'
'b608044c9e7530a400d8f5b88fdfe6e6'
diff --git a/abs/core/linhes-scripts/acl_fix_fstab.py b/abs/core/linhes-scripts/acl_fix_fstab.py
deleted file mode 100644
index 187cab1..0000000
--- a/abs/core/linhes-scripts/acl_fix_fstab.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python2
-import os
-import sys
-import subprocess as sub
-
-def should_add_acl(mount_point,fs_map):
- acl_fs_list=["ext3","ext4"]
- rc = False
- for i in fs_map:
- if i[0] == mount_point:
- if i[1] in acl_fs_list:
- rc = True
-
- return rc
-
-
-cmd="cp -f /etc/fstab /etc/fstab.backup.pre_acl"
-os.system(cmd)
-f = open('/etc/fstab', 'r')
-fstab=f.readlines()
-f.close()
-
-p = sub.Popen(['/sbin/fsck','-N' ],stdout=sub.PIPE,stderr=sub.PIPE)
-output, errors = p.communicate()
-output = output.split("\n")
-fs_map=[]
-for i in output:
- if i.startswith("["):
- split_line=i.split()
- #find mount_p and remove the last char
- mount_p = split_line[3][:-1]
- fstype = split_line[4].split(".")[1]
- append_tuple=(mount_p,fstype)
- fs_map.append(append_tuple)
-
-
-
-mp=['/' , '/myth', '/data']
-newfstab=[]
-for line in fstab:
- new_line=line
- split_line=line.split()
- try:
- if split_line[1] in mp and should_add_acl(split_line[1],fs_map):
- #print split_line[3]
- if "acl" in split_line[3]:
- pass
- else:
- print "Adding ACL"
- new_acl=split_line[3]+",acl"
- split_line[3]=new_acl
- new_line='\t'.join(split_line)
- except:
- pass
- newfstab.append(new_line)
-
-
-f = open('/etc/fstab', 'w')
-for i in newfstab:
- f.write(i)
- f.write("\n")
-
-f.close()
-
diff --git a/abs/core/linhes-scripts/linhes-scripts.install b/abs/core/linhes-scripts/linhes-scripts.install
index d4c9e59..f554bd0 100644
--- a/abs/core/linhes-scripts/linhes-scripts.install
+++ b/abs/core/linhes-scripts/linhes-scripts.install
@@ -2,13 +2,6 @@
post_upgrade() {
. /etc/profile
/usr/LH/bin/remove_php_mythvideo.sh
- if [ "`vercmp $2 7-24`" -lt 0 ]
- then
- echo "Applying ACL fix and remounting /"
- /usr/LH/bin/acl_fix_fstab.py
- mount -o remount /
- fi
-
}
# vim:set ts=2 sw=2 et: