diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-28 11:17:47 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-28 11:17:47 +0200 |
| commit | 957cdb7cfe02c08d4723bed38d967ea960bdd938 (patch) | |
| tree | 6d365041c4adfd4c5b8897067fe8eedda666d8e6 /scripts | |
| parent | da0801ebf47881bc14171d2c206b087eae6f689f (diff) | |
| download | vyos-live-build-957cdb7cfe02c08d4723bed38d967ea960bdd938.tar.gz vyos-live-build-957cdb7cfe02c08d4723bed38d967ea960bdd938.zip | |
Using 'none' instead of 'plain' when specifying that no chroot filesystem should be used.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_binary_chroot | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_binary_rootfs | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot index 720524344..388f84d01 100755 --- a/scripts/build/lb_binary_chroot +++ b/scripts/build/lb_binary_chroot @@ -85,7 +85,7 @@ ${LB_ROOT_COMMAND} rm -rf chroot/chroot ${LB_ROOT_COMMAND} rm -rf chroot.tmp # Copying new chroot -if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ] +if [ -d cache/stages_bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ] then ${LB_ROOT_COMMAND} mv chroot chroot.tmp ${LB_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 692a28d5a..280cd1a54 100755 --- a/scripts/build/lb_binary_rootfs +++ b/scripts/build/lb_binary_rootfs @@ -284,7 +284,7 @@ case "${LB_CHROOT_FILESYSTEM}" in Save_cache cache/packages_binary ;; - plain) + none) if [ -d binary/${INITFS}/filesystem.dir ] then rm -rf binary/${INITFS}/filesystem.dir diff --git a/scripts/build/lb_config b/scripts/build/lb_config index acf854973..c26b4fe47 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -55,7 +55,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--checksums md5|sha1|sha256|none]\n\ \t [--compression bzip2|gzip|lzip|none]\n\ \t [--build-with-chroot true|false]\n\ -\t [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\ +\t [--chroot-filesystem ext2|ext3|ext4|squashfs|jffs2|none]\n\ \t [--clean\n\ \t [-c|--conffile FILE]\n\ \t [--debconf-frontend dialog|editor|noninteractive|readline]\n\ |