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

chore: correct lowerdir, use echo to avoid error

Browse source
This commit is contained in:
Rudra Saraswat 2023-06-08 04:30:57 +05:30
parent 0b438336a7
commit 449a7da8ae
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
akshara
View file

@ -302,9 +302,9 @@ def handle_system_packages(operation):
exec('mount', subprocess.run(['findmnt', '-n', '-o', 'SOURCE', '/'], exec('mount', subprocess.run(['findmnt', '-n', '-o', 'SOURCE', '/'],
stdout=subprocess.PIPE).stdout.decode().strip(), '/.blendrw') stdout=subprocess.PIPE).stdout.decode().strip(), '/.blendrw')
exec('mount', '-t', 'overlay', 'overlay', '-o', exec('mount', '-t', 'overlay', 'overlay', '-o',
f'lowerdir=/usr,upperdir={usr_overlay},workdir={usr_overlay_workdir}', '/.blendrw/usr') f'lowerdir=/.blendrw/usr,upperdir={usr_overlay},workdir={usr_overlay_workdir}', '/.blendrw/usr')
exec('mount', '-t', 'overlay', 'overlay', '-o', exec('mount', '-t', 'overlay', 'overlay', '-o',
f'lowerdir=/var/lib/pacman,upperdir={varlibpacman_overlay},workdir={varlibpacman_overlay_workdir}', '/.blendrw/var/lib/pacman') f'lowerdir=/.blendrw/var/lib/pacman,upperdir={varlibpacman_overlay},workdir={varlibpacman_overlay_workdir}', '/.blendrw/var/lib/pacman')
if operation == 'set-custom-packages': if operation == 'set-custom-packages':
operation = ['-Sy', '--needed', '--noconfirm'] operation = ['-Sy', '--needed', '--noconfirm']
@ -360,7 +360,7 @@ def handle_system_packages(operation):
exec('mv', usr_overlay, '/.blend-overlays/future-usr') exec('mv', usr_overlay, '/.blend-overlays/future-usr')
exec('mv', varlibpacman_overlay, '/.blend-overlays/future-varlibpacman') exec('mv', varlibpacman_overlay, '/.blend-overlays/future-varlibpacman')
exec('rm', '-rf', usr_overlay_workdir, varlibpacman_overlay_workdir) exec('rm', '-rf', usr_overlay_workdir, varlibpacman_overlay_workdir)
exec('bash', '-c', "printf > /.custom_pkg_list") exec('bash', '-c', "echo -n > /.custom_pkg_list")
for pkg in args.pkg: for pkg in args.pkg:
exec('bash', '-c', f"echo '{pkg}' >> /.custom_pkg_list") exec('bash', '-c', f"echo '{pkg}' >> /.custom_pkg_list")
exec('touch', '/.blend-overlays/future-usr/.okay') exec('touch', '/.blend-overlays/future-usr/.okay')