diff options
| -rwxr-xr-x | scripts/install-system | 2 | ||||
| -rwxr-xr-x | scripts/quick-install | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/install-system b/scripts/install-system index 8ef02cc9..33ff8c7f 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1000,7 +1000,7 @@ setup_method_auto() { lsize=$(get_drive_size "$INSTALL_DRIVE") total=$ROOT_MIN if [ "$total" -gt "$lsize" ]; then - echo "Unfortunately, the OFR requires a total of at least $total"MB" to properly install." + echo "Unfortunately, the Vyatta requires a total of at least $total"MB" to properly install." echo "$INSTALL_DRIVE is below the minimum required capacity and therefore, cannot be used to" echo -e "complete the installation.\n" echo "If other drives are present" diff --git a/scripts/quick-install b/scripts/quick-install index 347cafd2..7a1273b9 100755 --- a/scripts/quick-install +++ b/scripts/quick-install @@ -571,7 +571,7 @@ install_grub () { # set serial console options echo -e "serial --unit=0 --speed=9600\nterminal --timeout=5 console serial\n\n" >> $grub_file # set primary boot option - echo -e "title Vyatta OFR\n\troot $root" >> $grub_file + echo -e "title Vyatta\n\troot $root" >> $grub_file echo -en "\tkernel /boot/vmlinuz root=/dev/$ROOT_PARTITION $ISCF console=ttyS0,9600 console=tty0\n" >> $grub_file echo -e "\tinitrd /boot/initrd.img" >> $grub_file @@ -675,7 +675,7 @@ setup_method_auto() { lsize=$(get_drive_size "$INSTALL_DRIVE") total=$(($ROOT_MIN + $CONFIG_MIN)) if [ "$total" -gt "$lsize" ]; then - echo "Unfortunately, the OFR requires a total of at least $total"MB" to properly install." + echo "Unfortunately, the Vyatta requires a total of at least $total"MB" to properly install." echo "$INSTALL_DRIVE is below the minimum required capacity and therefore, cannot be used to" echo -e "complete the installation.\n" echo "If other drives are present" diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index b3369ce4..26a322f2 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -178,7 +178,7 @@ fi if [ -f "$ROOTFSDIR/boot/vmlinuz" ] && ! eval $UNION ; then # Set first system boot option. Make KVM the default console in this one. - echo -e "menuentry \"Vyatta OFR (KVM console)\" {" + echo -e "menuentry \"Vyatta (KVM console)\" {" echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" @@ -186,7 +186,7 @@ fi # Set the second system boot option. Make the serial port be the default # console in this one. echo - echo -e "menuentry \"Vyatta OFR (Serial console)\" {" + echo -e "menuentry \"Vyatta (Serial console)\" {" echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $serial_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" @@ -196,12 +196,12 @@ fi if [ -n "$union_kernel_versions" ]; then for kversion in $union_kernel_versions; do echo - echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {" + echo -e "menuentry \"Vyatta linux$kversion (KVM console)\" {" echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/$livedir/initrd.img$kversion" echo -e "}" echo - echo -e "menuentry \"Vyatta OFR linux$kversion (Serial console)\" {" + echo -e "menuentry \"Vyatta linux$kversion (Serial console)\" {" echo -e "\tlinux /boot/$livedir/vmlinuz$kversion $GRUB_OPTIONS $serial_console" echo -e "\tinitrd /boot/$livedir/initrd.img$kversion" echo -e "}" @@ -212,12 +212,12 @@ fi if [ -n "$kernel_versions" ]; then for kversion in $kernel_versions; do echo - echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {" + echo -e "menuentry \"Vyatta linux$kversion (KVM console)\" {" echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img$kversion" echo -e "}" echo - echo -e "menuentry \"Vyatta OFR linux$kversion (Serial console)\" {" + echo -e "menuentry \"Vyatta linux$kversion (Serial console)\" {" echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $serial_console" echo -e "\tinitrd /boot/initrd.img$kversion" echo -e "}" |