diff --git a/grub.cfg b/grub.cfg index b184474..ed0638f 100644 --- a/grub.cfg +++ b/grub.cfg @@ -24,13 +24,6 @@ menuentry "##VERSION## Sipwise C5 PRO (sp1)" { initrd /boot/%SHORT_NAME%/initrd.img } -menuentry "##VERSION## Sipwise C5 PRO (sp2)" { - echo 'Loading kernel...' - linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpvers=##VERSION## nodhcp ngcphostname=sp2 ngcpnodename=sp2 - echo 'Loading initrd...' - initrd /boot/%SHORT_NAME%/initrd.img -} - menuentry "##VERSION## Sipwise C5 CARRIER (web01a)" { echo 'Loading kernel...' linux /boot/%SHORT_NAME%/vmlinuz live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpvers=##VERSION## nodhcp ngcpcrole=mgmt ngcphostname=web01a ngcpnodename=sp1 diff --git a/isolinux.cfg b/isolinux.cfg index bc45ad5..b24fd69 100644 --- a/isolinux.cfg +++ b/isolinux.cfg @@ -69,30 +69,20 @@ label prosp1-##VERSION## append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpvers=##VERSION## nodhcp ngcphostname=sp1 ngcpnodename=sp1 text help - Install Sipwise C5 - professional edition, version ##VERSION##. - Install first node of HA setup. - endtext - -label prosp2-##VERSION## - menu label ##VERSION## C5 PRO (sp2) - kernel /boot/%SHORT_NAME%/vmlinuz - append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpvers=##VERSION## nodhcp ngcphostname=sp2 ngcpnodename=sp2 - - text help - Install Sipwise C5 - professional edition, version ##VERSION##. - Install second node of HA setup. + Install Sipwise C5 professional edition, + version ##VERSION##. + Install sp1 node of PRO setup. + Other node will be installed from sp1. endtext - label carrier##VERSION## menu label ##VERSION## C5 CARRIER (web01a) kernel /boot/%SHORT_NAME%/vmlinuz append initrd=/boot/%SHORT_NAME%/initrd.img live-media-path=/live/%GRML_NAME%/ boot=live bootid=%BOOTID% apm=power-off mgag200.modeset=0 vga=791 quiet nomce net.ifnames=0 ngcppro ssh=sipwise debianrelease=##DIST## scripts ngcpvers=##VERSION## nodhcp ngcpcrole=mgmt ngcphostname=web01a ngcpnodename=sp1 text help - Install Sipwise C5 Carrier edition ##VERSION##. + Install Sipwise C5 Carrier edition, + version ##VERSION##. Install web01a node of Carrier setup. Other nodes will be installed from web01a. endtext