summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--cfg-version/system@10 (renamed from cfg-version/system@9)0
-rwxr-xr-xscripts/install/install-image-existing2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cecc9208..14df635d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,7 +110,7 @@ rsyslogdir = /etc/rsyslog.d
#rsyslog_DATA = sysconf/vyatta-log.conf
curver_DATA = cfg-version/vrrp@2
-curver_DATA += cfg-version/system@9
+curver_DATA += cfg-version/system@10
curver_DATA += cfg-version/broadcast-relay@1
curver_DATA += cfg-version/mdns@1
curver_DATA += cfg-version/dhcp-server@5
diff --git a/cfg-version/system@9 b/cfg-version/system@10
index e69de29b..e69de29b 100644
--- a/cfg-version/system@9
+++ b/cfg-version/system@10
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index 4fdfeda2..dab45379 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -268,7 +268,7 @@ if [ -e "$DEF_GRUB" ]; then
cp $DEF_GRUB $def_grub_vers
sed -i "s/menuentry \"VyOS.*(/menuentry \"VyOS $NEWNAME (/" $def_grub_vers
sed -i "s/menuentry \"Lost password change.*(/menuentry \"Lost password change $NEWNAME (/" $def_grub_vers
- sed -i "sX/boot/[A-Za-z0-9\.\-]*X/boot/${NEWNAME}Xg" $def_grub_vers
+ sed -i "s%/boot/[A-Za-z0-9\.\-]*%/boot/${NEWNAME}%g" $def_grub_vers
old_grub_cfg=$BOOT_DIR/grub/grub.cfg
new_grub_cfg=/tmp/grub.cfg.$$