askiiart-blendos/blend-inst
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix manual partitioning woes, and autodetect airootfs.sfs location

Browse source
This commit is contained in:
Rudra Saraswat 2023-04-20 23:05:17 +05:30
parent 0ac3dbb743
commit ab31e1dc4f
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
blend-inst
View file

@ -178,7 +178,7 @@ def inst_partition(config):
filesystem = p.split(':')[2] filesystem = p.split(':')[2]
blockdevice = p.split(':')[1] blockdevice = p.split(':')[1]
format_and_mount(mountpoint, filesystem, blockdevice) format_and_mount(mountpoint, filesystem, blockdevice)
if '/mnt' not in mountpoints or '/mnt/' not in mountpoints: if '/mnt' not in mountpoints and '/mnt/' not in mountpoints:
print() print()
print('Invalid manual partitioning configuration. There must be a partition with its mount point as /.') print('Invalid manual partitioning configuration. There must be a partition with its mount point as /.')
sys.exit(1) sys.exit(1)
@ -189,8 +189,24 @@ def inst_partition(config):
def inst_setup_base(config): def inst_setup_base(config):
exec(['unsquashfs', '-f', '-d', '/mnt', if testing == False:
'/run/archiso/bootmnt/blend/x86_64/airootfs.sfs']) airootfs_files = [os.path.join(dirpath, filename)
for (dirpath, dirs, files) in os.walk('/run/archiso')
for filename in (dirs + files)]
airootfs_sfs = 'none'
for f in airootfs_files:
if os.path.basename(f) == 'airootfs.sfs':
airootfs_sfs = f
break
if airootfs_sfs == 'none':
print("====================")
print("Failed installation.")
sys.exit(1)
exec(['unsquashfs', '-f', '-d', '/mnt',
airootfs_sfs])
else:
exec(['unsquashfs', '-f', '-d', '/mnt',
'/run/archiso/bootmnt/blend/x86_64/airootfs.sfs'])
# Enable system services # Enable system services
enable_service('bluetooth') enable_service('bluetooth')
enable_service('cups') enable_service('cups')