diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-10-28 12:00:13 +0100 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-10-28 12:00:13 +0100 |
| commit | 409958db9784c20a31418f8151eb8980953155fe (patch) | |
| tree | 3f29241a644218175e41ea92622a57cc559f3429 | |
| parent | b95ce37bd3ac6b042800720ce419618883c53b62 (diff) | |
| parent | 09ccfe7a7036018e9b3ac374eefdadb465bf49a6 (diff) | |
| download | vyos-build-409958db9784c20a31418f8151eb8980953155fe.tar.gz vyos-build-409958db9784c20a31418f8151eb8980953155fe.zip | |
Merge branch 'vyos:current' into current
| -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 |