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

chore (fix): do not remove tmp overlays

Browse source
This commit is contained in:
Rudra Saraswat 2023-06-04 23:14:49 +05:30
parent c91e3cec07
commit 0b438336a7
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
akshara
View file

@ -189,7 +189,7 @@ def update_system():
exec('chmod', '-R', '755', usr_overlay) exec('chmod', '-R', '755', usr_overlay)
if os.path.isdir('/.blend-overlays/future-usr'): if os.path.isdir('/.blend-overlays/future-usr'):
exec('rm', '-f', '/.blend-overlays/future-usr/.okay') exec('rm', '-f', '/.blend-overlays/future-usr/.okay')
exec('rm', '-rf', usr_overlay) exec('rm', '-rf', '/.blend-overlays/future-usr')
usr_overlay_workdir = subprocess.run( usr_overlay_workdir = subprocess.run(
['mktemp', '-d', '/mnt/.blend-tmp-overlay-XXXXXXXXXXXXX'], stdout=subprocess.PIPE).stdout.decode().strip() ['mktemp', '-d', '/mnt/.blend-tmp-overlay-XXXXXXXXXXXXX'], stdout=subprocess.PIPE).stdout.decode().strip()
exec('chmod', '-R', '755', usr_overlay_workdir) exec('chmod', '-R', '755', usr_overlay_workdir)
@ -198,7 +198,7 @@ def update_system():
exec('chmod', '-R', '755', varlibpacman_overlay) exec('chmod', '-R', '755', varlibpacman_overlay)
if os.path.isdir('/.blend-overlays/future-varlibpacman'): if os.path.isdir('/.blend-overlays/future-varlibpacman'):
exec('rm', '-f', '/.blend-overlays/future-varlibpacman/.okay') exec('rm', '-f', '/.blend-overlays/future-varlibpacman/.okay')
exec('rm', '-rf', varlibpacman_overlay) exec('rm', '-rf', '/.blend-overlays/future-varlibpacman')
varlibpacman_overlay_workdir = subprocess.run( varlibpacman_overlay_workdir = subprocess.run(
['mktemp', '-d', '/mnt/.blend-tmp-overlay-XXXXXXXXXXXXX'], stdout=subprocess.PIPE).stdout.decode().strip() ['mktemp', '-d', '/mnt/.blend-tmp-overlay-XXXXXXXXXXXXX'], stdout=subprocess.PIPE).stdout.decode().strip()
exec('chmod', '-R', '755', varlibpacman_overlay_workdir) exec('chmod', '-R', '755', varlibpacman_overlay_workdir)
@ -395,8 +395,8 @@ blendOS is not responsible for any system breakage.
{colors.bold}{colors.fg.cyan}available commands{colors.reset}: {colors.bold}{colors.fg.cyan}available commands{colors.reset}:
{colors.bold}help{colors.reset} Show this help message and exit. {colors.bold}help{colors.reset} Show this help message and exit.
{colors.bold}install{colors.reset} Install system drivers/packages. {colors.bold}set-custom-packages{colors.reset} Set the custom system packages to be included in the overlay.
{colors.bold}remove{colors.reset} Remove system drivers/packages. {colors.bold}drop-overlay{colors.reset} Drop an overlay created previously using set-custom-packages.
{colors.bold}version{colors.reset} Show version information and exit. {colors.bold}version{colors.reset} Show version information and exit.
{colors.bold}{colors.fg.cyan}options for commands{colors.reset}: {colors.bold}{colors.fg.cyan}options for commands{colors.reset}:

4
akshara.hook
View file

@ -64,10 +64,6 @@ run_latehook() {
mv /new_root/mnt/iso-update/iso/boot/intel-ucode.img /new_root/boot/intel-ucode.img mv /new_root/mnt/iso-update/iso/boot/intel-ucode.img /new_root/boot/intel-ucode.img
fi fi
for i in usr varlibpacman; do
rm -f /new_root/.blend-overlays/future-$i/.okay
done
# Successful update. # Successful update.
rm -f /new_root/mnt/iso-update/.etc-stage rm -f /new_root/mnt/iso-update/.etc-stage
touch /new_root/mnt/iso-update/.successful-update touch /new_root/mnt/iso-update/.successful-update