From 949efa4de60d604222944ac4394a63099a40a5c0 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 16 Apr 2019 00:16:05 -0700 Subject: [PATCH] Added hide items sections --- .bin/Scripts/build-ufd | 6 ++++++ .bin/Scripts/functions/ufd.py | 14 ++++++++++++++ .bin/Scripts/settings/ufd.py | 15 +++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd index 27f0b1af..21363677 100755 --- a/.bin/Scripts/build-ufd +++ b/.bin/Scripts/build-ufd @@ -101,6 +101,12 @@ if __name__ == '__main__': ) # Hide items + try_and_print( + message='Hiding items...', + function=hide_items, + ufd_dev=ufd_dev, + items=ITEMS_HIDDEN, + ) # Done if not args['--force']: diff --git a/.bin/Scripts/functions/ufd.py b/.bin/Scripts/functions/ufd.py index 274b50c1..de4994cb 100644 --- a/.bin/Scripts/functions/ufd.py +++ b/.bin/Scripts/functions/ufd.py @@ -175,6 +175,20 @@ def get_user_name(): return user +def hide_items(ufd_dev, items): + """Set FAT32 hidden flag for items.""" + # pylint: disable=invalid-name + with open('/root/.mtoolsrc', 'w') as f: + f.write('drive U: file="{}"\n'.format( + find_first_partition(ufd_dev))) + f.write('mtools_skip_check=1\n') + + # Hide items + for item in items: + cmd = ['yes | mattrib +h "U:/{}"'.format(item)] + run_program(cmd, check=False, shell=True) + + def install_syslinux(ufd_dev, use_mbr): """Install Syslinux to UFD.""" cmd = [ diff --git a/.bin/Scripts/settings/ufd.py b/.bin/Scripts/settings/ufd.py index 5123a8a1..db4a2127 100644 --- a/.bin/Scripts/settings/ufd.py +++ b/.bin/Scripts/settings/ufd.py @@ -95,6 +95,21 @@ ITEMS = { ('/sources/boot.wim', '/sources/'), ), } +ITEMS_HIDDEN = ( + # Linux (all versions) + 'arch', + 'arch_minimal', + 'dgpu', + 'EFI', + 'isolinux', + # WinPE + 'boot', + 'bootmgr', + 'bootmgr.efi', + 'en-us', + 'images', + 'sources', + ) if __name__ == '__main__': print("This file is not meant to be called directly.")