Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e0f3c5

Browse files
committed
Sat Apr 29 07:33:51 ADT 2023
1 parentae4d67b commit1e0f3c5

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#AshOS (Any Snapshot Hierarchical OS)
1010
###An immutable tree-shaped meta-distribution using snapshots
11-
######(for mere mortals!)
11+
######(No, this is not yet another skin/themed "distro"!)
1212

1313
---
1414

‎setup.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
use_distro=use_other_iso
2828
else:
2929
use_distro=distro
30-
try:# CAUTION: comment lines28-35 & unindent line36 if prepared manually
31-
ifis_efi:
32-
subprocess.check_output([f'./src/prep/{use_distro}_live.sh',f'{args[1]}',f'{args[2]}',f'{args[3]}'])
33-
else:
34-
subprocess.check_output([f'./src/prep/{use_distro}_live.sh',f'{args[1]}',f'{args[2]}'])
35-
exceptsubprocess.CalledProcessErrorase:
36-
print(f"F: There was an error in prep steps!{e.output.decode('utf-8')}")
37-
else:
38-
__import__(f"src.distros.{distro}.installer")
30+
# try: # CAUTION: comment lines30-37 & unindent line38 if prepared manually
31+
# if is_efi:
32+
# subprocess.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}', f'{args[3]}'])
33+
# else:
34+
# subprocess.check_output([f'./src/prep/{use_distro}_live.sh', f'{args[1]}', f'{args[2]}'])
35+
# except subprocess.CalledProcessError as e:
36+
# print(f"F: There was an error in prep steps! {e.output.decode('utf-8')}")
37+
# else:
38+
__import__(f"src.distros.{distro}.installer")
3939
else:
4040
print("F: Distribution could not be detected!")
4141

‎src/installer_core.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ def bundler():
3232
withTemporaryDirectory(dir="/tmp",prefix="ash.")astmpdir:
3333
csmp_file=urlopen("https://github.com/ashos/bundle/raw/main/python311anytree.com").read()
3434
open(f"{tmpdir}/python.com","wb").write(csmp_file)
35+
open(f"{tmpdir}/.args","w").write("/zip/ash\n...")
3536
os.system(f"cat{installer_dir}/src/ashpk_core.py{installer_dir}/src/distros/{distro}/ashpk.py >{tmpdir}/ash")
36-
os.system(f"zip{tmpdir}/python.com{tmpdir}/ash")
37-
# Make it executable
37+
os.system(f"zip{tmpdir}/python.com{tmpdir}/ash{tmpdir}/.args")
38+
# Make it executable
3839
mode=stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH
3940
os.chmod(f"{tmpdir}/python.com",mode)
4041
ifis_efi:
41-
# mount EFI if not mounted
42-
ifnotos.path.ismount(args[3]):
42+
ifnotos.path.ismount(args[3]):# mount EFI if not mounted
4343
os.system(f"mount{args[3]} /mnt/boot/efi")
4444
os.system(f"mv{tmpdir}/python.com /mnt/boot/efi/ash")
4545
os.system(f"{SUDO} umount{args[3]}")# REVIEW redundant?
@@ -99,8 +99,7 @@ def bundler_advanced():
9999
mode=stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH
100100
os.chmod(f"{tmpdir}/python.com",mode)
101101
ifis_efi:
102-
# mount EFI if not mounted
103-
ifnotos.path.ismount(args[3]):
102+
ifnotos.path.ismount(args[3]):# mount EFI if not mounted
104103
os.system(f"mount{args[3]} /mnt/boot/efi")
105104
os.system(f"mv{tmpdir}/python.com /mnt/boot/efi/ash")
106105
os.system(f"{SUDO} umount{args[3]}")# REVIEW redundant?

‎src/prep/parted_gpt_example.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ if [ $# -eq 0 ]; then
88
fi
99

1010
parted --align minimal --script$1 mklabel gpt unit MiB \
11-
mkpart ESP fat32 0%256set 1 boot on \
12-
mkpart primary ext4256 80% \
11+
mkpart ESP fat32 0%512set 1 boot on \
12+
mkpart primary ext4512 80% \
1313
mkpart primary ext4 80% 100%
1414
mkfs.vfat -F32 -n EFI${1}1
1515

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp