diff options
| author | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2017-12-16 22:18:21 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2017-12-21 14:22:36 +0100 |
| commit | d3edb76ad43b81b734dc84588a4e44c51dc90a44 (patch) | |
| tree | 3d744400bb41f4146d52b2b3b2416d2327a088b7 | |
| parent | f77034606e7b291b9a0824f105aa76be64ec7cbc (diff) | |
| download | vyos-live-build-d3edb76ad43b81b734dc84588a4e44c51dc90a44.tar.gz vyos-live-build-d3edb76ad43b81b734dc84588a4e44c51dc90a44.zip | |
Fix handling of multiple kernels in binary_loopback_cfg
Now grub.cfg shows all the kernel options. Before this patch when you
had more than two kernels it only showed the auto option.
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f2e6488b5..e4b5b449f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ live-build (1:20171208) UNRELEASED; urgency=medium * Restore i386/amd64 autodetection in grub after rename of i386 kernel from -486 to -686. Closes: #884585 Thanks to Adrian Gibanel Lopez for the patch. + * Fix handling of multiple kernels in binary_loopback_cfg. + Closes: #884588 Thanks to Adrian Gibanel Lopez for the patch. -- Raphaël Hertzog <hertzog@debian.org> Thu, 21 Dec 2017 14:14:04 +0100 diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index 2e6787a72..ff487a40f 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -211,7 +211,7 @@ fi _COUNT=0 for KERNEL in chroot/boot/vmlinuz-*; do - _COUNT=$(( $COUNT + 1 )) + _COUNT=$(( $_COUNT + 1 )) done if [ $_COUNT -gt 1 ]; then |