summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@sentrium.io>2019-07-31 09:21:53 -0500
committerJohn Estabrook <jestabro@sentrium.io>2019-07-31 09:23:14 -0500
commit7d259935b08927a2649544448ee8c66da832b8fc (patch)
tree625d0205c3e051f7d99965b0131fd44b253fc53c /scripts
parent995b5071d15f0a5a9d8c5f261f188e5252a966a4 (diff)
downloadvyatta-cfg-system-7d259935b08927a2649544448ee8c66da832b8fc.tar.gz
vyatta-cfg-system-7d259935b08927a2649544448ee8c66da832b8fc.zip
T1553: add 'noautologin' to boot parameters
Debian live-config (>= 5.0) will set the default to 'autologin' when booting in live mode, unless explicitly set.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-grub-setup2
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 }' \