From 2f01c91c1ace43d62f6bb0b96d908de65bef028c Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 31 Jan 2020 01:37:25 +0100 Subject: [PATCH] pmbootstrap -s: remove option (!1868) Remove in favor of similar, but more visible "--no-install" option for "pmbootstrap flasher" and "pmbootstrap export". It seems that the option wasn't really used by anybody, so let's just remove it without a deprication period. If dear reader thinks otherwise after this is merged, and is not happy with "--no-install", please state your reasoning in a new issue, so we can discuss it. Related: !1863 --- pmb/chroot/initfs.py | 5 ----- pmb/parse/arguments.py | 3 --- 2 files changed, 8 deletions(-) diff --git a/pmb/chroot/initfs.py b/pmb/chroot/initfs.py index d564c141..904f222d 100644 --- a/pmb/chroot/initfs.py +++ b/pmb/chroot/initfs.py @@ -25,11 +25,6 @@ import pmb.helpers.cli def build(args, flavor, suffix): - # Bail out when '-s' is set - if args.skip_initfs: - logging.info("NOTE: Skipped initramfs generation (-s)!") - return - # Update mkinitfs and hooks pmb.chroot.apk.install(args, ["postmarketos-mkinitfs"], suffix) pmb.chroot.initfs_hooks.update(args, suffix) diff --git a/pmb/parse/arguments.py b/pmb/parse/arguments.py index 93e292d2..893bbc05 100644 --- a/pmb/parse/arguments.py +++ b/pmb/parse/arguments.py @@ -311,9 +311,6 @@ def arguments(): parser.add_argument("-j", "--jobs", help="parallel jobs when compiling") parser.add_argument("-p", "--aports", help="postmarketos aports (pmaports) path") - parser.add_argument("-s", "--skip-initfs", dest="skip_initfs", - help="do not re-generate the initramfs", - action="store_true") parser.add_argument("-t", "--timeout", help="seconds after which processes" " get killed that stopped writing any output (default:" " 900)", default=900, type=float)