Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Use variable in format.py and add labels to partitions

Browse source
This commit is contained in:
Pablo Castellano 2017-06-22 12:19:53 +02:00
parent d4719f41c9
commit efab93e4d0
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pmb/install/format.py
View file

@ -23,33 +23,39 @@ import pmb.chroot
def format_and_mount_boot(args): def format_and_mount_boot(args):
mountpoint = "/mnt/install/boot" mountpoint = "/mnt/install/boot"
logging.info("(native) format /dev/installp1 (boot, ext2), mount to " + device = "/dev/installp1"
logging.info("(native) format " + device + " (boot, ext2), mount to " +
mountpoint) mountpoint)
pmb.chroot.root(args, ["mkfs.ext2", "-F", "-q", "/dev/installp1"]) pmb.chroot.root(args, ["mkfs.ext2", "-F", "-q", "-L", "pmOS_boot", device])
pmb.chroot.root(args, ["mkdir", "-p", mountpoint]) pmb.chroot.root(args, ["mkdir", "-p", mountpoint])
pmb.chroot.root(args, ["mount", "/dev/installp1", mountpoint]) pmb.chroot.root(args, ["mount", device, mountpoint])
def format_and_mount_root(args): def format_and_mount_root(args):
mountpoint = "/dev/mapper/pm_crypt" mountpoint = "/dev/mapper/pm_crypt"
logging.info("(native) format /dev/installp2 (root, luks), mount to " + device = "/dev/installp2"
mountpoint) if not args.no_fde:
pmb.chroot.root(args, ["cryptsetup", "luksFormat", "--use-urandom", logging.info("(native) format " + device + " (root, luks), mount to " +
"--cipher", args.cipher, "-q", "/dev/installp2"], log=False) mountpoint)
pmb.chroot.root(args, ["cryptsetup", "luksOpen", "/dev/installp2", pmb.chroot.root(args, ["cryptsetup", "luksFormat", "--use-urandom",
"pm_crypt"], log=False) "--cipher", args.cipher, "-q", device], log=False)
if not os.path.exists(args.work + "/chroot_native" + mountpoint): pmb.chroot.root(args, ["cryptsetup", "luksOpen", device,
raise RuntimeError("Failed to open cryptdevice!") "pm_crypt"], log=False)
if not os.path.exists(args.work + "/chroot_native" + mountpoint):
raise RuntimeError("Failed to open cryptdevice!")
def format_and_mount_pm_crypt(args): def format_and_mount_pm_crypt(args):
cryptdevice = "/dev/mapper/pm_crypt" if args.no_fde:
device = "/dev/installp2"
else:
device = "/dev/mapper/pm_crypt"
mountpoint = "/mnt/install" mountpoint = "/mnt/install"
logging.info("(native) format " + cryptdevice + " (ext4), mount to " + logging.info("(native) format " + device + " (ext4), mount to " +
mountpoint) mountpoint)
pmb.chroot.root(args, ["mkfs.ext4", "-F", "-q", cryptdevice]) pmb.chroot.root(args, ["mkfs.ext4", "-F", "-q", "-L", "pmOS_root", device])
pmb.chroot.root(args, ["mkdir", "-p", mountpoint]) pmb.chroot.root(args, ["mkdir", "-p", mountpoint])
pmb.chroot.root(args, ["mount", cryptdevice, mountpoint]) pmb.chroot.root(args, ["mount", device, mountpoint])
def format(args): def format(args):