diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-10-28 10:42:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 10:42:34 +0000 |
| commit | 09ccfe7a7036018e9b3ac374eefdadb465bf49a6 (patch) | |
| tree | 317f89c56b95ac766fabd9f89e42fcf1835f411e /data | |
| parent | 38dc111f0c29e79a202d430fbb9297555e28bd71 (diff) | |
| parent | 61d3585f19045424684ff5ccc978f810264ea8c1 (diff) | |
| download | vyos-build-09ccfe7a7036018e9b3ac374eefdadb465bf49a6.tar.gz vyos-build-09ccfe7a7036018e9b3ac374eefdadb465bf49a6.zip | |
Merge pull request #822 from sarthurdev/grub_fix
live: T5568: Fix live grub menu entries
Diffstat (limited to 'data')
| -rwxr-xr-x | data/live-build-config/hooks/live/01-live-serial.binary | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/live-build-config/hooks/live/01-live-serial.binary b/data/live-build-config/hooks/live/01-live-serial.binary index e138b20d..05785da7 100755 --- a/data/live-build-config/hooks/live/01-live-serial.binary +++ b/data/live-build-config/hooks/live/01-live-serial.binary @@ -10,22 +10,22 @@ SERIAL_CONSOLE="console=tty0 console=ttyS0,115200" GRUB_MENUENTRY=$(sed -e '/menuentry.*hotkey.*/,/^}/!d' -e 's/--hotkey=l//g' $GRUB_PATH) # Update KVM menuentry name -sed -i 's/"Live system \((.*-vyos)\)"/"Live system \1 - KVM console"/' $GRUB_PATH +sed -i 's/"Live system \((.*vyos)\)"/"Live system \1 - KVM console"/' $GRUB_PATH # Insert serial menuentry echo "$GRUB_MENUENTRY" | sed \ - -e 's/"Live system \((.*-vyos)\)"/"Live system \1 - Serial console"/' \ + -e 's/"Live system \((.*vyos)\)"/"Live system \1 - Serial console"/' \ -e "s/$KVM_CONSOLE/$SERIAL_CONSOLE/g" >> $GRUB_PATH # Live.cfg Update ISOLINUX_MENUENTRY=$(sed -e '/label live-\(.*\)-vyos$/,/^\tappend.*/!d' $ISOLINUX_PATH) # Update KVM menuentry name -sed -i 's/Live system \((.*-vyos)\)/Live system \1 - KVM console/' $ISOLINUX_PATH +sed -i 's/Live system \((.*vyos)\)/Live system \1 - KVM console/' $ISOLINUX_PATH # Insert serial menuentry echo "\n$ISOLINUX_MENUENTRY" | sed \ -e 's/live-\(.*\)-vyos/live-\1-vyos-serial/' \ -e '/^\tmenu default/d' \ - -e 's/Live system \((.*-vyos)\)/Live system \1 - Serial console/' \ + -e 's/Live system \((.*vyos)\)/Live system \1 - Serial console/' \ -e "s/$KVM_CONSOLE/$SERIAL_CONSOLE/g" >> $ISOLINUX_PATH |