diff options
| -rwxr-xr-x | abs/core/LinHES-system/PKGBUILD | 8 | ||||
| -rw-r--r-- | abs/core/LinHES-system/add_storage.py | 23 | ||||
| -rw-r--r-- | abs/core/LinHES-system/create_media_dirs.sh | 74 |
3 files changed, 53 insertions, 52 deletions
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index c2cbcd0..0c956b6 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=69 +pkgrel=75 arch=('i686' 'x86_64') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -70,7 +70,7 @@ md5sums=('4921a6e21c71b263b8d23c51c24b939c' '542e670e78d117657f93141e9689f54d' '48b763dba127aac6ab05c84643f83b71' 'eeb7bb20905e031142ce0b575aad78c9' - '294e54209538018008323d164ce39fb3' + '4545eb39213d40b5a2bdeda5e066cdc4' '962a3e9eaba2d1466251b7ab0956705d' 'd03aedeeeda0f5e9c1eb437411c88477' '94ce8f1d5085c0db7b267db8c2e9a3ff' @@ -78,13 +78,13 @@ md5sums=('4921a6e21c71b263b8d23c51c24b939c' '9c2294ccfd5359583497a6b03d918a27' '859a80ddb4c234506379c605114c1343' '47e093e8cfe4b5b96602358e1f540832' - '16fd1106a37c86617f03b412b9c043c1' + '98e20635736ae1fc008def99f9330f16' 'b8f0414427c5d9afdc32ceb3ae56f82a' '6519d209e151cdc39ae7e1091d189c3e' 'd1cdf28fcb1c88f0e504905771dd6040' '88c669b8eeb988106bd26c9cf8277df2' '4a3cd8f9b33b2b86fdba47a8f1fa2859' - '359a4bf507b8104b6af9e53b5c784b94' + '4d5a2441fe681c85986c5626c2944a3d' 'a182af47a7d373b2a63a27e1bb7485b2' '5148fe4c6ac27fff8152c819c4d2b47a' 'ea315f41dcd6c978e546c95fc05546cf' diff --git a/abs/core/LinHES-system/add_storage.py b/abs/core/LinHES-system/add_storage.py index 3f02acd..6afe7c3 100644 --- a/abs/core/LinHES-system/add_storage.py +++ b/abs/core/LinHES-system/add_storage.py @@ -20,9 +20,9 @@ storage_dir = "/etc/storage.d" pickle_file = "%s/storage.pkl" %storage_dir -SG_MAP_BE={ 'Default' :'tv', +SG_MAP_BE={ 'Default' :'media/tv', 'LiveTV' :'media/tv/live', -'DB Backups' :'system_backups/mythtv_db/'} +'DB Backups' :'system_backups/mythtv_backups/'} SG_MAP_FE={ @@ -48,7 +48,7 @@ class disk_device: device_obj = bus.get_object("org.freedesktop.UDisks", device) device_props = dbus.Interface(device_obj, dbus.PROPERTIES_IFACE) self.storage_dir = storage_dir - self.top_mount_dir = "/storage" + self.top_mount_dir = "/data/storage" self.config = ConfigParser.RawConfigParser() self.fs_map = self.get_fsmap() self.is_device = self.get_is_device(device_props) @@ -173,8 +173,8 @@ class disk_device: return fs_map def find_fstype(self,moutpoint): - fstype="ext3" - mp=['/myth', '/data/media'] + fstype="xfs" + mp=['/myth', '/data/storage/disk0/media'] for i in self.fs_map: if i[1] in mp: fstype = i[2] @@ -214,7 +214,7 @@ class disk_device: return fstab def find_options_type(self,fstab): - mp=['/myth', '/data/media'] + mp=['/myth', '/data/storage/disk0/media'] for i in fstab: split_line=i.split() try: @@ -238,7 +238,7 @@ class disk_device: self.new_mount_point="%s/%s_%s" %(self.top_mount_dir,self.model.replace(' ',''),self.serial_number.replace(' ','')) if bind: - new_fstab_list=["/myth" , self.new_mount_point , "none" , "rw,bind", '0', '0'] + new_fstab_list=["/data/storage/disk0" , self.new_mount_point , "none" , "rw,bind", '0', '0'] else: #determine options @@ -344,10 +344,13 @@ class disk_device: return def symlink(self): + pass print " Creating symlink" - cmd = "ln -s %s %s/myth " %(self.new_mount_point, self.top_mount_dir) - runcmd(cmd) - cmd = "ln -s %s %s/data " %(self.new_mount_point, self.top_mount_dir) + #cmd = "ln -s %s %s/myth " %(self.new_mount_point, self.top_mount_dir) + #runcmd(cmd) + #cmd = "ln -s %s %s/disk0 " %(self.new_mount_point, self.top_mount_dir) + #runcmd(cmd) + cmd = "ln -s %s/media /myth " %(self.new_mount_point) runcmd(cmd) diff --git a/abs/core/LinHES-system/create_media_dirs.sh b/abs/core/LinHES-system/create_media_dirs.sh index 64970d0..96aa5ea 100644 --- a/abs/core/LinHES-system/create_media_dirs.sh +++ b/abs/core/LinHES-system/create_media_dirs.sh @@ -27,45 +27,43 @@ do chmod 775 "${topdir}/${dirname}" chmod 775 "${topdir}/${dirname}/.media" done <<EOF -tv -tv/live -gallery -music -games/nes/roms -games/nes/screens -games/nes -games/pc/screens -games/pc -games/snes/roms -games/snes/screens -games/snes -games/xmame/cabs -games/xmame/flyers -games/xmame/hiscores -games/xmame/history -games/xmame/roms -games/xmame/screens -games/xmame -games +media/tv +media/tv/live +media/gallery +media/music +media/games/nes/roms +media/games/nes/screens +media/games/nes +media/games/pc/screens +media/games/pc +media/games/snes/roms +media/games/snes/screens +media/games/snes +media/games/xmame/cabs +media/games/xmame/flyers +media/games/xmame/hiscores +media/games/xmame/history +media/games/xmame/roms +media/games/xmame/screens +media/games/xmame +media/games +media/video +media/tmp +media/archive +media/pretty +media/video_stuff/trailers +media/video_stuff/coverart +media/video_stuff/fanart +media/video_stuff/screenshots +media/video_stuff/banners +media/games/screenshots +media/games/fanart +media/games/boxart backup -image_cache -video/.covers -video/archive -video -motion -tmp -archive -stream -pretty -video_stuff/trailers -video_stuff/coverart -video_stuff/fanart -video_stuff/screenshots -video_stuff/banners -games/screenshots -games/fanart -games/boxart -system_backups/restore +backup/system_backups +backup/system_backups +backup/user_backups +backup/mythtv_backups EOF chown -R mythtv:users ${topdir} |