synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #218 from postmarketOS/fix/162-install-no-args.add 

Install: Small improvements (Fix #162, Close #215)
This commit is contained in:
Martijn Braam 2017-07-23 12:08:56 +02:00 committed by GitHub
parent 7e1221c32e 66cda810c1
commit 14f164b8a2
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmb/flasher/frontend.py
View File

@ -84,8 +84,8 @@ def system(args):
# Generate system image, install flasher
img_path = "/home/user/rootfs/" + args.device + ".img"
if not os.path.exists(args.work + "/chroot_native" + img_path):
setattr(args, "sdcard", None)
pmb.install.install(args, False)
raise RuntimeError("The system image has not been generated yet,"
" please run 'pmbootstrap install' first.")
pmb.flasher.init(args)
# Run the flasher

2
pmb/install/format.py
View File

@ -37,6 +37,8 @@ def format_and_mount_root(args):
if args.full_disk_encryption:
logging.info("(native) format " + device + " (root, luks), mount to " +
mountpoint)
logging.info(
" *** TYPE IN THE FULL DISK ENCRYPTION PASSWORD (TWICE!) ***")
pmb.chroot.root(args, ["cryptsetup", "luksFormat", "--use-urandom",
"--cipher", args.cipher, "-q", device], log=False)
pmb.chroot.root(args, ["cryptsetup", "luksOpen", device,

57
pmb/install/install.py
View File

@ -67,6 +67,7 @@ def set_user_password(args):
"""
Loop until the passwords for user and root have been changed successfully.
"""
logging.info(" *** SET LOGIN PASSWORD FOR: 'user' ***")
suffix = "rootfs_" + args.device
while True:
try:
@ -78,7 +79,7 @@ def set_user_password(args):
pass
def install(args, show_flash_msg=True):
def install(args):
# Install required programs in native chroot
logging.info("*** (1/5) PREPARE NATIVE CHROOT ***")
pmb.chroot.apk.install(args, pmb.config.install_native_packages,
@ -122,32 +123,32 @@ def install(args, show_flash_msg=True):
fix_mount_folders(args)
pmb.chroot.shutdown(args, True)
# Flash to target device
# Kernel flash information
logging.info("*** (5/5) FLASHING TO DEVICE ***")
if show_flash_msg:
logging.info("Run the following to flash your installation to the"
" target device:")
logging.info("* pmbootstrap flasher flash_kernel")
logging.info(" Flashes the kernel + initramfs to your device:")
logging.info(
" " +
args.work +
"/chroot_rootfs_" +
args.device +
"/boot")
method = args.deviceinfo["flash_methods"]
if (method in pmb.config.flashers and "boot" in
pmb.config.flashers[method]["actions"]):
logging.info(" (NOTE: " + method + " also supports booting"
" the kernel/initramfs directly without flashing."
" Use 'pmbootstrap flasher boot' to do that.)")
logging.info("Run the following to flash your installation to the"
" target device:")
logging.info("* pmbootstrap flasher flash_kernel")
logging.info(" Flashes the kernel + initramfs to your device:")
logging.info(" " + args.work + "/chroot_rootfs_" + args.device +
"/boot")
method = args.deviceinfo["flash_methods"]
if (method in pmb.config.flashers and "boot" in
pmb.config.flashers[method]["actions"]):
logging.info(" (NOTE: " + method + " also supports booting"
" the kernel/initramfs directly without flashing."
" Use 'pmbootstrap flasher boot' to do that.)")
if not args.sdcard:
logging.info("* pmbootstrap flasher flash_system")
logging.info(" Flashes the system image, that has been"
" generated to your device:")
logging.info(" " + args.work + "/chroot_native/home/user/rootfs/" +
args.device + ".img")
logging.info(" (NOTE: This file has a partition table,"
" which contains one currently unused boot"
" partition, and the root partition.)")
# System flash information
if not args.sdcard:
logging.info("* pmbootstrap flasher flash_system")
logging.info(" Flashes the system image, that has been"
" generated to your device:")
logging.info(" " + args.work + "/chroot_native/home/user/rootfs/" +
args.device + ".img")
logging.info(" (NOTE: This file has a partition table,"
" which contains a boot- and root subpartition.)")
# Export information
logging.info("* If the above steps do not work, you can also create"
" symlinks to the generated files with 'pmbootstrap flasher"
" export <target_dir>' and flash outside of pmbootstrap.")