diff options
Diffstat (limited to 'linhes/linhes-system/add_storage.py')
| -rwxr-xr-x | linhes/linhes-system/add_storage.py | 201 |
1 files changed, 46 insertions, 155 deletions
diff --git a/linhes/linhes-system/add_storage.py b/linhes/linhes-system/add_storage.py index e210bf1..e880884 100755 --- a/linhes/linhes-system/add_storage.py +++ b/linhes/linhes-system/add_storage.py @@ -5,7 +5,7 @@ #Disks that are mounted, in fstab, size < 5000 bytes, optical or #have already been seen will not be presented as an option. # -# Version 2.0.1 +# Version 2.0.2 import dbus import pickle @@ -188,7 +188,6 @@ class disk_device: return def get_fsmap(self): - #block,point,fs fs_map=[] f = open('/proc/mounts','r') @@ -243,7 +242,7 @@ class disk_device: tmpuuid = runcmd(cmd)[1] splituuid = tmpuuid.partition("=") uuid = splituuid[2].replace('"', "") - # logging.info("The uuid is %s", uuid) + #logging.info("The uuid is %s", uuid) if uuid == '': print("Could not find a UUID for device: %s" %partition) sys.exit(1) @@ -272,38 +271,38 @@ class disk_device: return options,i - def add_fstab(self,bind=False): - new_fstab_list=['UUID=', 'mount_point', 'auto', 'defaults', '0', '1'] + def add_fstab(self): + #new_fstab_list=['UUID=', 'mount_point', 'auto', 'defaults', '0', '1'] + new_fstab_list=['UUID=', 'mount_point', self.new_fstype, 'defaults', '0', '1'] fstab=self.read_fstab() new_fstab=[] #determine mount_path self.new_mount_point="%s/%s_%s" %(self.top_mount_dir,self.model.replace(' ',''),self.serial_number.replace(' ','')) - if bind: - new_fstab_list=["/data/storage/disk0" , self.new_mount_point , "none" , "rw,bind", '0', '0'] - uuid=self.find_uuid(self.block_partition) - else: - #check for old mount point and comment out - for line in fstab: - if not line.startswith("#"): - if line.find(self.new_mount_point) > -1: - print(" Found old mount %s in fstab, commenting out" %self.new_mount_point) - line = "#"+line + #check for old mount point and comment out + for line in fstab: + if not line.startswith("#"): + if line.find(self.new_mount_point) > -1: + print(" Found old mount %s in fstab, commenting out" %self.new_mount_point) + line = "#"+line new_fstab.append(line) - fstab=new_fstab + fstab=new_fstab - #determine options - new_options = self.find_options_type(fstab)[0] + #determine options + #new_options = self.find_options_type(fstab)[0] + new_options = "nofail,x-systemd.device-timeout=1" - #find blkid - self.block_partition="%s1" %self.block_path - uuid=self.find_uuid(self.block_partition) + #find blkid + self.block_partition="%s1" %self.block_path + uuid=self.find_uuid(self.block_partition) - #construct new line - new_fstab_list[0]="UUID=%s" %uuid - new_fstab_list[1]=self.new_mount_point - new_fstab_list[3]=new_options + #construct new line + new_fstab_list[0]="UUID=%s" %uuid + new_fstab_list[1]=self.new_mount_point + new_fstab_list[3]=new_options + if self.new_fstype == "xfs": + new_fstab_list[5]="0" new_fstab_line='\t'.join(new_fstab_list) new_fstab_line="%s\n" %new_fstab_line @@ -311,10 +310,8 @@ class disk_device: #add line to fstab f = open('/etc/fstab', 'w') - #f = open('/tmp/fstab', 'w') for i in fstab: f.write(i) - #f.write("\n") f.close() return @@ -416,15 +413,6 @@ class disk_device: cmd = "ln -s %s %s" %(self.new_mount_point,disk_ln) runcmd(cmd) - def symlink(self): - pass - print(" Creating symlink for /myth") - if not os.path.exists("/myth"): - cmd = "ln -s %s/media /myth " %(self.new_mount_point) - runcmd(cmd) - else: - print(" Skipping symlink, /myth already exists") - #end of class @@ -672,7 +660,7 @@ def main(scan_only, destruction, no_mount, install_call, dir_sg): print(" Unknown or Unmounted Disks:") f = open('/tmp/scan_report', 'w') for i in process_list: - f.write("disk: %s , location: %s ,size: %s \n" %(i.model,i.block_path,i.device_size)) + f.write("disk: %s, location: %s, size: %s\n" %(i.model,i.block_path,i.device_size)) print("\n") print(" ---------------------------------------------------------") print(" Found New Disk:") @@ -695,12 +683,6 @@ def main(scan_only, destruction, no_mount, install_call, dir_sg): else: print("\nThere are no disks to add to your system.\n\nFor more options: add_storage.py --help\n") write_known_drive_list(system_drive_list) - #BE = MythBE(db=DB) - - - #save new list to disk_device - #write_known_drive_list(system_drive_list) - #disk_num = last_disk_num() if len(process_list) > 0: @@ -719,7 +701,6 @@ def main(scan_only, destruction, no_mount, install_call, dir_sg): i.format_disk() i.add_fstab() i.mount_disk(no_mount) - #if destruction == True: if dir_sg == True: i.mkdirs(FS_LIST) @@ -736,72 +717,6 @@ def main(scan_only, destruction, no_mount, install_call, dir_sg): i.add_sg(DB,host,SG_MAP) print("-----") - #cmd = "systemconfig.py -m fileshare" - #runcmd(cmd) - #i.add_sg(DB,host,SG_MAP) - -def myth_main(no_mount,install_call,dir_sg): - global bus - bus = dbus.SystemBus() - #search for root - f = open('/etc/fstab', 'r') - fstab=f.readlines() - f.close() - for i in fstab: - split_line=i.split() - if not split_line: - continue - - try: - if split_line[1] == "/" : - uuid_device = split_line[0] - break - except: - print("Couldn't find / in fstab") - sys.exit(1) - if uuid_device.startswith("UUID"): - uuid_device = uuid_device.split("=")[1] - cmd = "blkid -U %s" %uuid_device - device = runcmd(cmd)[1] - else: - device = uuid_device.strip() - #should have something like /dev/sda1 - #remove all the digits - device = ''.join([letter for letter in device if not letter.isdigit()]) - - - system_drive_list = scan_system() - for i in system_drive_list: - if i.block_path == device: - break - else: - print("Couldn't find root device in block list") - sys.exit(1) - if not install_call == True: - DB = MythDB() - host=gethostname() - else: - DB = None - host=gethostname() - - - print(" Disk: %s" %(i.get_name())) - i.set_mmount(True) - i.set_dir_sg(dir_sg) - i.set_partition("7") - i.set_disk_num(0) - i.lookup_format() - i.add_fstab(True) - #if not install_call: - i.mount_disk(no_mount) - i.write_config() - #no need to make the sub directories because the install process has taken care of it. - if dir_sg == True: - i.add_sg(DB,host,SG_MAP,'99',install_call) - - i.symlink() - cmd = "systemconfig.py -m fileshare" - runcmd(cmd) def reconstruct_storagegroups(): print("\nRecreating storage groups from contents of /etc/storage.d/\n") @@ -833,7 +748,7 @@ def reconstruct_storagegroups(): except configparser.NoOptionError as err: print("SG not found in conf, get setting from DB") dir_sg = False - # Get storage sroup directories from DB + # Get storage group directories from DB recs = DB.getStorageGroup(groupname="Default") for record in recs: if record.dirname.startswith(mount_point): @@ -908,8 +823,6 @@ class reconstruct_path: self.uuid = parser.get('storage', 'uuid') self.mount_point = parser.get('storage', 'mountpoint') self.shareable = parser.get('storage', 'shareable') - self.myth_mount = parser.get('storage', 'mmount') - self.bind = self.myth_mount self.disk_num = parser.get('storage', 'disk_num') self.top_mount_dir = os.path.dirname(self.mount_point) try: @@ -989,19 +902,9 @@ class reconstruct_path: new_fstab_line="%s\n" %new_fstab_line f = open('/etc/fstab', 'a') - #f = open('/tmp/fstab', 'a') f.write(new_fstab_line) - #f.write("\n") f.close() - def symlink(self): - print(" Creating symlink for /myth") - if not os.path.exists("/myth"): - cmd = "ln -s %s/media /myth " %(self.mount_point) - runcmd(cmd) - else: - print(" Skipping symlink, /myth already exists") - def symlink_disk(self): print(" Creating symlink for disk%s" %self.disk_num) disk_ln="%s/disk%s" %(self.top_mount_dir,self.disk_num) @@ -1013,38 +916,29 @@ class reconstruct_path: new_fstab_list=['UUID=', 'mount_point', self.fstype, 'defaults', '0', '1'] fstab=self.read_fstab() - if self.bind == "True": - self.symlink() - if self.check_in_fstab(fstab,self.uuid) == True: print(" Found UUID of disk in fstab, will not add it") else: print(" Adding storage to fstab") - if self.bind == "True" : - print(" Bind mount") - new_fstab_list=["/data/storage/disk0" , self.mount_point , "none" , "rw,bind", '0', '0'] - if self.check_in_fstab(fstab,self.mount_point) == False: - self.append_fstab(new_fstab_list) - else: - print(" Found bind storage in fstab, will not add it") + #check for old mount point and comment out + f = open('/etc/fstab', 'w') + for line in fstab: + if not line.startswith("#"): + if line.find(self.mount_point) > -1: + print(" Found old mount %s in fstab, commenting out" %self.mount_point) + line = "#"+line + f.write(line) + f.close() - else: - #check for old mount point and comment out - f = open('/etc/fstab', 'w') - for line in fstab: - if not line.startswith("#"): - if line.find(self.mount_point) > -1: - print(" Found old mount %s in fstab, commenting out" %self.mount_point) - line = "#"+line - f.write(line) - f.close() - - #construct new line - new_options = self.find_options_type(fstab)[0] - new_fstab_list[0]="UUID=%s" %self.uuid - new_fstab_list[1]=self.mount_point - new_fstab_list[3]=new_options - self.append_fstab(new_fstab_list) + #construct new line + #new_options = self.find_options_type(fstab)[0] + new_options = "nofail,x-systemd.device-timeout=1" + new_fstab_list[0]="UUID=%s" %self.uuid + new_fstab_list[1]=self.mount_point + new_fstab_list[3]=new_options + if self.fstype == "xfs": + new_fstab_list[5]="0" + self.append_fstab(new_fstab_list) def mount_disk(self,no_mount=False): try: @@ -1124,7 +1018,6 @@ def usage(): (if user enables MythTV storage groups) Write out the disk config file to /etc/storage.d/ Create disk# symlink at /data/storage/ - Create /myth symlink (if applicable) Create MythTV storage group paths in MythTV database (if user enables MythTV storage groups) @@ -1142,7 +1035,7 @@ def usage(): partition on a disk and ignores all others. --no_mount: Do not mount the disk. All other normal operations will be performed. - --reconstruct: Recreate mount point, /myth symlink, fstab entry, + --reconstruct: Recreate mount point, fstab entry, /data/storage/disk# symlink, and mount the disk. --no_mount is the only option that works with --reconstruct. @@ -1215,9 +1108,7 @@ if __name__ == "__main__": if "--reconstruct_sg" in sys.argv: reconstruct_sg = True - if "--double_myth" in sys.argv: - myth_main(no_mount, install_call, dir_sg) - elif reconstruct == True: + if reconstruct == True: reconstruct_mounts(no_mount) elif reconstruct_sg == True: reconstruct_storagegroups() |