Rename args.no_fde to args.full_disk_encryption
This commit is contained in:
parent
86cb9f5ec8
commit
4573863561
|
@ -34,7 +34,7 @@ def format_and_mount_boot(args):
|
||||||
def format_and_mount_root(args):
|
def format_and_mount_root(args):
|
||||||
mountpoint = "/dev/mapper/pm_crypt"
|
mountpoint = "/dev/mapper/pm_crypt"
|
||||||
device = "/dev/installp2"
|
device = "/dev/installp2"
|
||||||
if not args.no_fde:
|
if args.full_disk_encryption:
|
||||||
logging.info("(native) format " + device + " (root, luks), mount to " +
|
logging.info("(native) format " + device + " (root, luks), mount to " +
|
||||||
mountpoint)
|
mountpoint)
|
||||||
pmb.chroot.root(args, ["cryptsetup", "luksFormat", "--use-urandom",
|
pmb.chroot.root(args, ["cryptsetup", "luksFormat", "--use-urandom",
|
||||||
|
@ -46,10 +46,10 @@ def format_and_mount_root(args):
|
||||||
|
|
||||||
|
|
||||||
def format_and_mount_pm_crypt(args):
|
def format_and_mount_pm_crypt(args):
|
||||||
if args.no_fde:
|
if args.full_disk_encryption:
|
||||||
device = "/dev/installp2"
|
|
||||||
else:
|
|
||||||
device = "/dev/mapper/pm_crypt"
|
device = "/dev/mapper/pm_crypt"
|
||||||
|
else:
|
||||||
|
device = "/dev/installp2"
|
||||||
mountpoint = "/mnt/install"
|
mountpoint = "/mnt/install"
|
||||||
logging.info("(native) format " + device + " (ext4), mount to " +
|
logging.info("(native) format " + device + " (ext4), mount to " +
|
||||||
mountpoint)
|
mountpoint)
|
||||||
|
|
|
@ -155,7 +155,7 @@ def arguments():
|
||||||
install.add_argument("--add", help="comma separated list of packages to be"
|
install.add_argument("--add", help="comma separated list of packages to be"
|
||||||
" added to the rootfs (e.g. 'vim,gcc')")
|
" added to the rootfs (e.g. 'vim,gcc')")
|
||||||
install.add_argument("--no-fde", help="do not use full disk encryption",
|
install.add_argument("--no-fde", help="do not use full disk encryption",
|
||||||
action="store_true")
|
action="store_false", dest="full_disk_encryption")
|
||||||
|
|
||||||
# Action: build / checksum / menuconfig / parse_apkbuild / aportgen
|
# Action: build / checksum / menuconfig / parse_apkbuild / aportgen
|
||||||
menuconfig = sub.add_parser("menuconfig", help="run menuconfig on"
|
menuconfig = sub.add_parser("menuconfig", help="run menuconfig on"
|
||||||
|
|
Loading…
Reference in New Issue