diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 15:53:27 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 16:03:10 +0200 |
| commit | 279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e (patch) | |
| tree | 15e180ee76e6665f52f6b32bffc633605e002615 /scripts/build/binary_rootfs | |
| parent | f93e83e351193a93c0a529798f7d01997c9d0909 (diff) | |
| download | vyos-live-build-279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e.tar.gz vyos-live-build-279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e.zip | |
Dropping automagics for ubuntu.
Future live-build versions will still allow to use casper,
but its configuration will be done differently by a custom
config tree, rather than embedded and maintenance intensive
code in live-build itself.
Diffstat (limited to 'scripts/build/binary_rootfs')
| -rwxr-xr-x | scripts/build/binary_rootfs | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index ba2f49a22..f4fa0f67e 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -137,11 +137,7 @@ case "${LB_CHROOT_FILESYSTEM}" in # Move image mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS} - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size if [ -e chroot/chroot.cache ] then @@ -348,10 +344,7 @@ case "${LB_CHROOT_FILESYSTEM}" in esac fi - if [ "${LB_MODE}" != "ubuntu" ] - then - MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" - fi + MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" case "${LB_BUILD_WITH_CHROOT}" in true) @@ -367,11 +360,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f chroot/chroot/excludes - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size # Move image mv chroot/filesystem.squashfs binary/${INITFS} @@ -432,11 +421,7 @@ case "${LB_CHROOT_FILESYSTEM}" in mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS} - case "${LB_MODE}" in - ubuntu) - du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size - ;; - esac + du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size ;; esac |