From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B86313835A for ; Sun, 27 Dec 2020 23:15:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A156E0DEE; Sun, 27 Dec 2020 23:15:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61D2CE0DEE for ; Sun, 27 Dec 2020 23:15:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 902FB340F6C for ; Sun, 27 Dec 2020 23:15:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EA184B for ; Sun, 27 Dec 2020 23:15:22 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1608346612.03914bb12003cbf1b34be07f356b97c9c06d10fe.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/target_image_setup.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 03914bb12003cbf1b34be07f356b97c9c06d10fe X-VCS-Branch: master Date: Sun, 27 Dec 2020 23:15:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17c5df29-152c-44d9-9624-87474355a9c1 X-Archives-Hash: f53075c78c62354c84daab768dc1d269 commit: 03914bb12003cbf1b34be07f356b97c9c06d10fe Author: Matt Turner gentoo org> AuthorDate: Sat Dec 19 00:23:32 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03914bb1 catalyst: Remove set_dest_path() root_path is always set, so half of this function was dead. The other half set the same thing as set_stage_path(). Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 20 ++++++-------------- targets/support/target_image_setup.sh | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ba6b1a1b..ed4d1227 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -154,7 +154,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_source_path() self.set_chroot_path() self.set_autoresume_path() - self.set_dest_path() self.set_stage_path() self.set_target_path() @@ -426,13 +425,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.generate_hash(self.settings["source_path"], "sha1") log.notice('Source path set to %s', self.settings['source_path']) - def set_dest_path(self): - if "root_path" in self.settings: - self.settings["destpath"] = normpath(self.settings["chroot_path"] + - self.settings["root_path"]) - else: - self.settings["destpath"] = normpath(self.settings["chroot_path"]) - def set_cleanables(self): self.settings['cleanables'] = [ "/etc/resolv.conf", @@ -845,7 +837,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "/root_overlay"]: if os.path.exists(x): log.info('Copying root_overlay: %s', x) - cmd(['rsync', '-a', x + '/', self.settings['destpath']], + cmd(['rsync', '-a', x + '/', self.settings['stage_path']], env=self.env) def bind(self): @@ -1095,7 +1087,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: for x in self.settings["cleanables"]: log.notice('Cleaning chroot: %s', x) - clear_path(normpath(self.settings["destpath"] + x)) + clear_path(normpath(self.settings["stage_path"] + x)) # Put /etc/hosts back into place hosts_file = self.settings['chroot_path'] + '/etc/hosts' @@ -1119,14 +1111,14 @@ class StageBase(TargetBase, ClearBase, GenBase): log.debug("clean(), portage_preix = %s, no sticky-config", self.settings["portage_prefix"]) for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env": - target = pjoin(self.settings["destpath"], + target = pjoin(self.settings["stage_path"], "etc/portage/%s" % _dir, self.settings["portage_prefix"]) log.notice("Clearing portage_prefix target: %s", target) clear_path(target) # Remove hacks that should *never* go into stages - target = pjoin(self.settings["destpath"], "etc/portage/patches") + target = pjoin(self.settings["stage_path"], "etc/portage/patches") if os.path.exists(target): log.warning("You've been hacking. Clearing target patches: %s", target) clear_path(target) @@ -1172,7 +1164,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings[self.settings["spec_prefix"] + "/empty"].split() for x in self.settings[self.settings["spec_prefix"] + "/empty"]: - myemp = self.settings["destpath"] + x + myemp = self.settings["stage_path"] + x if not os.path.isdir(myemp) or os.path.islink(myemp): log.warning('not a directory or does not exist, ' 'skipping "empty" operation: %s', x) @@ -1192,7 +1184,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # We're going to shell out for all these cleaning # operations, so we get easy glob handling. log.notice('%s: removing %s', self.settings["spec_prefix"], x) - clear_path(self.settings["destpath"] + x) + clear_path(self.settings["stage_path"] + x) try: if os.path.exists(self.settings["controller_file"]): cmd([self.settings['controller_file'], 'clean'], diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index fdc4a234..f9427eaf 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -7,11 +7,11 @@ mkdir -p "${1}" echo "Creating ${clst_fstype} filesystem" case ${clst_fstype} in squashfs) - gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \ + gensquashfs -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \ || die "Failed to create squashfs filesystem" ;; jffs2) - mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \ + mkfs.jffs2 --root="${clst_stage_path}" --output="${1}/image.jffs" "${clst_fsops}" \ || die "Failed to create jffs2 filesystem" ;; esac From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D815D1382C5 for ; Mon, 18 Jan 2021 19:53:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDA37E0814; Mon, 18 Jan 2021 19:53:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9529E0814 for ; Mon, 18 Jan 2021 19:53:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA93F340EE6 for ; Mon, 18 Jan 2021 19:53:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB60E4A6 for ; Mon, 18 Jan 2021 19:53:45 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1608346612.03914bb12003cbf1b34be07f356b97c9c06d10fe.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/target_image_setup.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 03914bb12003cbf1b34be07f356b97c9c06d10fe X-VCS-Branch: pending/mattst88 Date: Mon, 18 Jan 2021 19:53:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0c579f6c-5d15-41c0-9a7c-222aeda3ad51 X-Archives-Hash: f7fd23e230a3fb137a0fd98eb8356314 Message-ID: <20210118195345.MZNY8g70lzKPeOo7SyGc0_VSKA-pRJlCIc89fIy974w@z> commit: 03914bb12003cbf1b34be07f356b97c9c06d10fe Author: Matt Turner gentoo org> AuthorDate: Sat Dec 19 00:23:32 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03914bb1 catalyst: Remove set_dest_path() root_path is always set, so half of this function was dead. The other half set the same thing as set_stage_path(). Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 20 ++++++-------------- targets/support/target_image_setup.sh | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ba6b1a1b..ed4d1227 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -154,7 +154,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_source_path() self.set_chroot_path() self.set_autoresume_path() - self.set_dest_path() self.set_stage_path() self.set_target_path() @@ -426,13 +425,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.generate_hash(self.settings["source_path"], "sha1") log.notice('Source path set to %s', self.settings['source_path']) - def set_dest_path(self): - if "root_path" in self.settings: - self.settings["destpath"] = normpath(self.settings["chroot_path"] + - self.settings["root_path"]) - else: - self.settings["destpath"] = normpath(self.settings["chroot_path"]) - def set_cleanables(self): self.settings['cleanables'] = [ "/etc/resolv.conf", @@ -845,7 +837,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "/root_overlay"]: if os.path.exists(x): log.info('Copying root_overlay: %s', x) - cmd(['rsync', '-a', x + '/', self.settings['destpath']], + cmd(['rsync', '-a', x + '/', self.settings['stage_path']], env=self.env) def bind(self): @@ -1095,7 +1087,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: for x in self.settings["cleanables"]: log.notice('Cleaning chroot: %s', x) - clear_path(normpath(self.settings["destpath"] + x)) + clear_path(normpath(self.settings["stage_path"] + x)) # Put /etc/hosts back into place hosts_file = self.settings['chroot_path'] + '/etc/hosts' @@ -1119,14 +1111,14 @@ class StageBase(TargetBase, ClearBase, GenBase): log.debug("clean(), portage_preix = %s, no sticky-config", self.settings["portage_prefix"]) for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env": - target = pjoin(self.settings["destpath"], + target = pjoin(self.settings["stage_path"], "etc/portage/%s" % _dir, self.settings["portage_prefix"]) log.notice("Clearing portage_prefix target: %s", target) clear_path(target) # Remove hacks that should *never* go into stages - target = pjoin(self.settings["destpath"], "etc/portage/patches") + target = pjoin(self.settings["stage_path"], "etc/portage/patches") if os.path.exists(target): log.warning("You've been hacking. Clearing target patches: %s", target) clear_path(target) @@ -1172,7 +1164,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings[self.settings["spec_prefix"] + "/empty"].split() for x in self.settings[self.settings["spec_prefix"] + "/empty"]: - myemp = self.settings["destpath"] + x + myemp = self.settings["stage_path"] + x if not os.path.isdir(myemp) or os.path.islink(myemp): log.warning('not a directory or does not exist, ' 'skipping "empty" operation: %s', x) @@ -1192,7 +1184,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # We're going to shell out for all these cleaning # operations, so we get easy glob handling. log.notice('%s: removing %s', self.settings["spec_prefix"], x) - clear_path(self.settings["destpath"] + x) + clear_path(self.settings["stage_path"] + x) try: if os.path.exists(self.settings["controller_file"]): cmd([self.settings['controller_file'], 'clean'], diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index fdc4a234..f9427eaf 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -7,11 +7,11 @@ mkdir -p "${1}" echo "Creating ${clst_fstype} filesystem" case ${clst_fstype} in squashfs) - gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \ + gensquashfs -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \ || die "Failed to create squashfs filesystem" ;; jffs2) - mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \ + mkfs.jffs2 --root="${clst_stage_path}" --output="${1}/image.jffs" "${clst_fsops}" \ || die "Failed to create jffs2 filesystem" ;; esac From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 831F31382C5 for ; Sat, 19 Dec 2020 19:56:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D5062BC02A; Sat, 19 Dec 2020 19:56:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 244F62BC02A for ; Sat, 19 Dec 2020 19:56:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA5E7340DA0 for ; Sat, 19 Dec 2020 19:56:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22CB946C for ; Sat, 19 Dec 2020 19:56:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1608346612.03914bb12003cbf1b34be07f356b97c9c06d10fe.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/target_image_setup.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 03914bb12003cbf1b34be07f356b97c9c06d10fe X-VCS-Branch: wip/mattst88 Date: Sat, 19 Dec 2020 19:56:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11cef1bd-1e99-4614-859b-078bda37323f X-Archives-Hash: db99d59281b64b072c8a5453aefaca3b Message-ID: <20201219195603.Fes3RKYd7j_-xX_1fSwfQTG7iqgwe2O8KCgpgwEmRt4@z> commit: 03914bb12003cbf1b34be07f356b97c9c06d10fe Author: Matt Turner gentoo org> AuthorDate: Sat Dec 19 00:23:32 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=03914bb1 catalyst: Remove set_dest_path() root_path is always set, so half of this function was dead. The other half set the same thing as set_stage_path(). Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 20 ++++++-------------- targets/support/target_image_setup.sh | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index ba6b1a1b..ed4d1227 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -154,7 +154,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_source_path() self.set_chroot_path() self.set_autoresume_path() - self.set_dest_path() self.set_stage_path() self.set_target_path() @@ -426,13 +425,6 @@ class StageBase(TargetBase, ClearBase, GenBase): self.generate_hash(self.settings["source_path"], "sha1") log.notice('Source path set to %s', self.settings['source_path']) - def set_dest_path(self): - if "root_path" in self.settings: - self.settings["destpath"] = normpath(self.settings["chroot_path"] + - self.settings["root_path"]) - else: - self.settings["destpath"] = normpath(self.settings["chroot_path"]) - def set_cleanables(self): self.settings['cleanables'] = [ "/etc/resolv.conf", @@ -845,7 +837,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "/root_overlay"]: if os.path.exists(x): log.info('Copying root_overlay: %s', x) - cmd(['rsync', '-a', x + '/', self.settings['destpath']], + cmd(['rsync', '-a', x + '/', self.settings['stage_path']], env=self.env) def bind(self): @@ -1095,7 +1087,7 @@ class StageBase(TargetBase, ClearBase, GenBase): else: for x in self.settings["cleanables"]: log.notice('Cleaning chroot: %s', x) - clear_path(normpath(self.settings["destpath"] + x)) + clear_path(normpath(self.settings["stage_path"] + x)) # Put /etc/hosts back into place hosts_file = self.settings['chroot_path'] + '/etc/hosts' @@ -1119,14 +1111,14 @@ class StageBase(TargetBase, ClearBase, GenBase): log.debug("clean(), portage_preix = %s, no sticky-config", self.settings["portage_prefix"]) for _dir in "package.accept_keywords", "package.keywords", "package.mask", "package.unmask", "package.use", "package.env", "env": - target = pjoin(self.settings["destpath"], + target = pjoin(self.settings["stage_path"], "etc/portage/%s" % _dir, self.settings["portage_prefix"]) log.notice("Clearing portage_prefix target: %s", target) clear_path(target) # Remove hacks that should *never* go into stages - target = pjoin(self.settings["destpath"], "etc/portage/patches") + target = pjoin(self.settings["stage_path"], "etc/portage/patches") if os.path.exists(target): log.warning("You've been hacking. Clearing target patches: %s", target) clear_path(target) @@ -1172,7 +1164,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings[self.settings["spec_prefix"] + "/empty"].split() for x in self.settings[self.settings["spec_prefix"] + "/empty"]: - myemp = self.settings["destpath"] + x + myemp = self.settings["stage_path"] + x if not os.path.isdir(myemp) or os.path.islink(myemp): log.warning('not a directory or does not exist, ' 'skipping "empty" operation: %s', x) @@ -1192,7 +1184,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # We're going to shell out for all these cleaning # operations, so we get easy glob handling. log.notice('%s: removing %s', self.settings["spec_prefix"], x) - clear_path(self.settings["destpath"] + x) + clear_path(self.settings["stage_path"] + x) try: if os.path.exists(self.settings["controller_file"]): cmd([self.settings['controller_file'], 'clean'], diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index fdc4a234..f9427eaf 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -7,11 +7,11 @@ mkdir -p "${1}" echo "Creating ${clst_fstype} filesystem" case ${clst_fstype} in squashfs) - gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \ + gensquashfs -D "${clst_stage_path}" -q ${clst_fsops} "${1}/image.squashfs" \ || die "Failed to create squashfs filesystem" ;; jffs2) - mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \ + mkfs.jffs2 --root="${clst_stage_path}" --output="${1}/image.jffs" "${clst_fsops}" \ || die "Failed to create jffs2 filesystem" ;; esac