general-packages/pikainstall
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix home check

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2023-10-20 18:16:36 +03:00
parent 3f5563f141
commit 0bba839821
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pikainstall/debian/changelog
View File

@ -1,4 +1,4 @@
pikainstall (1.0-100pika1) pikauwu; urgency=medium pikainstall (1.0.1-100pika1) pikauwu; urgency=medium
* Initial release. * Initial release.

2
pikainstall/debian/control
View File

@ -8,5 +8,5 @@ Rules-Requires-Root: no
Package: pikainstall Package: pikainstall
Architecture: linux-any Architecture: linux-any
Depends: ${misc:Depends}, squashfs-tools, arch-install-scripts Depends: ${misc:Depends}, squashfs-tools, arch-install-scripts, cryptsetup
Description: Command line installer for PikaOS Description: Command line installer for PikaOS

5
pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh
View File

@ -1,6 +1,11 @@
#! /bin/bash #! /bin/bash
apt remove casper -y apt remove casper -y
apt autoremove -y apt autoremove -y
if [ -f /tmp/albius-crypttab-root.sh ]
then
chmod +x /tmp/albius-crypttab-root.sh
/tmp/albius-crypttab-root.sh
fi
if [ -f /tmp/albius-crypttab.sh ] if [ -f /tmp/albius-crypttab.sh ]
then then
chmod +x /tmp/albius-crypttab.sh chmod +x /tmp/albius-crypttab.sh

34
pikainstall/usr/lib/pika/pikainstall/pikainstall
View File

@ -6,7 +6,7 @@ import subprocess
import os import os
# Version # Version
version="1.0" version="1.0.1"
dist="PikaOS 3" dist="PikaOS 3"
image="/cdrom/casper/filesystem.squashfs" image="/cdrom/casper/filesystem.squashfs"
@ -21,9 +21,13 @@ echo '"'Boot with logging'"' '"'nvidia-drm.modeset=1 root=UUID={ROOT_PART_UUID}
echo '"'Boot with safe graphics'"' '"'nvidia-drm.modeset=1 root=UUID={ROOT_PART_UUID} nomodeset ---'"' >> /boot/refind_linux.conf echo '"'Boot with safe graphics'"' '"'nvidia-drm.modeset=1 root=UUID={ROOT_PART_UUID} nomodeset ---'"' >> /boot/refind_linux.conf
""" """
_CRYPTTAB_SETUP_FILE = """#!/usr/bin/bash _CRYPTTAB_ROOT_SETUP_FILE = """#!/usr/bin/bash
cat /etc/crypttab cat /etc/crypttab
echo "crypt_root UUID={ROOT_PART_UUID} none luks,discard" > /etc/crypttab echo "crypt_root UUID={ROOT_PART_UUID} none luks,discard" > /etc/crypttab
"""
_CRYPTTAB_SETUP_FILE = """#!/usr/bin/bash
cat /etc/crypttab
echo "crypt_home UUID={HOME_PART_UUID} /keyfile.txt luks" >> /etc/crypttab echo "crypt_home UUID={HOME_PART_UUID} /keyfile.txt luks" >> /etc/crypttab
touch /keyfile.txt touch /keyfile.txt
openssl genrsa > /keyfile.txt openssl genrsa > /keyfile.txt
@ -131,16 +135,26 @@ subprocess.run(efi_flag_cmd)
CHROOT_PATH = listToString(args.root) CHROOT_PATH = listToString(args.root)
# Write crypttab script if system has encryption # Write crypttab script if system has encryption
if home_encrypt == "luks_none": if root_encrypt != "luks_none":
CRYPTTAB_FILE_PATH = '/tmp/albius-crypttab.sh' CRYPTTAB_ROOT_FILE_PATH = '/tmp/albius-crypttab-root.sh'
CHROOT_CRYPTTAB_FILE_PATH=os.path.join(dir,file) CHROOT_CRYPTTAB_ROOT_FILE_PATH = os.path.join(CHROOT_PATH,CRYPTTAB_ROOT_FILE_PATH)
with open(CHROOT_CRYPTTAB_FILE_PATH, "w") as file: with open(CHROOT_CRYPTTAB_ROOT_FILE_PATH, "w") as file:
albius_crypttab_file = _CRYPTTAB_SETUP_FILE.format( albius_crypttab_root_file = _CRYPTTAB_ROOT_SETUP_FILE.format(
ROOT_PART_UUID=root_uuid, ROOT_PART_UUID=root_uuid,
HOME_PART_UUID=home_uuid,
LUKS_PASSWD=home_passwd,
) )
file.write(albius_crypttab_file) file.write(albius_crypttab_root_file)
# Write crypttab script if system has encryption
if args.home is not None:
if home_encrypt != "luks_none":
CRYPTTAB_FILE_PATH = '/tmp/albius-crypttab.sh'
CHROOT_CRYPTTAB_FILE_PATH =os .path.join(CHROOT_PATH,CRYPTTAB_FILE_PATH)
with open(CHROOT_CRYPTTAB_FILE_PATH, "w") as file:
albius_crypttab_file = _CRYPTTAB_SETUP_FILE.format(
HOME_PART_UUID=home_uuid,
LUKS_PASSWD=home_passwd,
)
file.write(albius_crypttab_file)
# Write refind script if system has encryption # Write refind script if system has encryption
REFIND_FILE_PATH = '/tmp/albius-refind_linux.sh' REFIND_FILE_PATH = '/tmp/albius-refind_linux.sh'