diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2016-12-02 15:10:19 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-12-02 15:10:19 +0100 |
| commit | 7ad6c408e559a1755beb63db8186e002a56bb7a7 (patch) | |
| tree | 6604f11f25c07ba04e90d37d559de2e5c417e133 | |
| parent | 58fd378005400ca4592f21e74f105625344a72b3 (diff) | |
| download | vyos-live-build-7ad6c408e559a1755beb63db8186e002a56bb7a7.tar.gz vyos-live-build-7ad6c408e559a1755beb63db8186e002a56bb7a7.zip | |
Default for LB_UNION_FILESYSTEM is now "overlay" just like in live-boot.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_grub-legacy | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 3e9bd8c59..660d02bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ live-build (1:20161128) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8. * Use a grub theme that integrates reasonably well with the current background picture. + * Default for LB_UNION_FILESYSTEM is now "overlay" just like in live-boot. [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 diff --git a/functions/defaults.sh b/functions/defaults.sh index 90921d722..ad5771937 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -396,7 +396,7 @@ Set_defaults () LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}" # Setting union filesystem - LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}" + LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-overlay}" # Setting interactive shell/X11/Xnest LB_INTERACTIVE="${LB_INTERACTIVE:-false}" diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy index 93d9b9e14..fea9b7b6a 100755 --- a/scripts/build/binary_grub-legacy +++ b/scripts/build/binary_grub-legacy @@ -164,7 +164,7 @@ Check_multiarchitectures mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters -if [ "${LB_UNION_FILESYSTEM}" != "aufs" ] +if [ "${LB_UNION_FILESYSTEM}" != "overlay" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}" fi diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 4688d49d2..8a7b41815 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -186,7 +186,7 @@ Check_multiarchitectures mkdir -p "${DESTDIR_LIVE}" # Setting boot parameters -if [ "${LB_UNION_FILESYSTEM}" != "aufs" ] +if [ "${LB_UNION_FILESYSTEM}" != "overlay" ] then LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}" fi |