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

Fix new sanity checks

Browse Source
This commit is contained in:
Ward Nakchbandi (Cosmic Fusion) 2024-01-04 15:42:40 +03:00 committed by GitHub
parent fe98fea2bf
commit e44d7ae917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pikainstall/usr/lib/pika/pikainstall/pikainstall
View File

@ -145,38 +145,37 @@ elif args.home is not None:
print("Error: EFI and Home are mounted on the same drive, consider removing the -H/--home argument.") print("Error: EFI and Home are mounted on the same drive, consider removing the -H/--home argument.")
exit(1) exit(1)
# Make sure mountpoints are not /dev prefixes # Make sure mountpoints are not /dev prefixes
if args.root.startswith('/dev'): if args.root[0].startswith('/dev'):
print("Error: Root mount point is pointed a device, please use a mountpoint.") print("Error: Root mount point is pointed a device, please use a mountpoint.")
exit(1) exit(1)
if args.boot.startswith('/dev'): if args.boot[0].startswith('/dev'):
print("Error: Boot mount point is pointed a device, please use a mountpoint.") print("Error: Boot mount point is pointed a device, please use a mountpoint.")
exit(1) exit(1)
if args.efi.startswith('/dev'): if args.efi[0].startswith('/dev'):
print("Error: EFI mount point is pointed a device, please use a mountpoint.") print("Error: EFI mount point is pointed a device, please use a mountpoint.")
exit(1) exit(1)
if args.home is not None: if args.home is not None:
if args.home.startswith('/dev'): if args.home[0].startswith('/dev'):
print("Error: Home mount point is pointed a device, please use a mountpoint.") print("Error: Home mount point is pointed a device, please use a mountpoint.")
exit(1) exit(1)
# Make sure All mounts are releative to chroot # Make sure All mounts are releative to chroot
if boot.startswith(args.root): if args.boot[0].startswith(args.root[0]):
print("Boot Partition Check: OK!") print("Boot Partition Check: OK!")
else: else:
print("Error: Boot mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!") print("Error: Boot mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!")
exit(1) exit(1)
if efi.startswith(args.root): if args.efi[0].startswith(args.root[0]):
print("EFI Partition Check: OK!") print("EFI Partition Check: OK!")
else: else:
print("Error: EFI mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!") print("Error: EFI mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!")
exit(1) exit(1)
if args.home is not None: if args.home is not None:
if boot.startswith(args.root): if args.home[0].startswith(args.root[0]):
print("Home Partition Check: OK!") print("Home Partition Check: OK!")
else: else:
print("Error: Home mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!") print("Error: Home mount point is not relative to chroot, please mount it some inside the chroot and supply the new mountpoint!")
exit(1) exit(1)
# With All Checks Clear and info gathered let's start installing # With All Checks Clear and info gathered let's start installing
## extract the squashfs image to root from casper ## extract the squashfs image to root from casper