diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-08-14 13:23:46 -0400 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-08-14 13:23:46 -0400 |
| commit | b51217fdc5d6ad7ce3bb92db1f8aefd44453d912 (patch) | |
| tree | fa2bba49a4c94200ee87833d71e02632e9fc1236 /scripts/vyatta-grub-setup | |
| parent | c728fd8b53fefe363999354a99fd749b359feb72 (diff) | |
| parent | 28be52b8965b87f98395ec21aea6c042c6bf7fd8 (diff) | |
| download | vyatta-cfg-system-b51217fdc5d6ad7ce3bb92db1f8aefd44453d912.tar.gz vyatta-cfg-system-b51217fdc5d6ad7ce3bb92db1f8aefd44453d912.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'scripts/vyatta-grub-setup')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index de67ba60..bc2c653c 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet rootdelay=5 vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ |