Rename "live-rw" to only "rw".

3 files changed, 7 insertions, 7 deletions

diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index b238f787..b17aa563 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -480,7 +480,7 @@ save_image_config() {
     rm -fr /mnt/config
     mkdir /mnt/config
 
-    output=$(cp -pR /mnt/tmp/boot/$image_name/live-rw/config/* /mnt/config)
+    output=$(cp -pR /mnt/tmp/boot/$image_name/rw/config/* /mnt/config)
 
     if [ -n "$output" ]; then
         echo -e "Warning: error in copying the old config partition.\nSee $INSTALL_LOG for more details."
@@ -492,7 +492,7 @@ save_image_config() {
 save_image_keys() {
     image_name=$1
 
-    if [ ! -d /mnt/tmp/boot/$image_name/live-rw/etc/ssh ]; then
+    if [ ! -d /mnt/tmp/boot/$image_name/rw/etc/ssh ]; then
 	echo "No SSH keys found on $image_name, so none can be saved."
 	return;
     fi
@@ -506,7 +506,7 @@ save_image_keys() {
     fi
 
     mkdir -p /mnt/ssh
-    output=$(cp -p /mnt/tmp/boot/$image_name/live-rw/etc/ssh/ssh_host_* /mnt/ssh)
+    output=$(cp -p /mnt/tmp/boot/$image_name/rw/etc/ssh/ssh_host_* /mnt/ssh)
 
     if [ -n "$output" ]; then
         echo -e "Warning: error in copying the old ssh keys."
@@ -552,7 +552,7 @@ save_old_info() {
 	image_dirs=/mnt/tmp/boot/*
 
 	for dir in $image_dirs; do
-	    if [ -f $dir/live-rw/config/.vyatta_config ]; then
+	    if [ -f $dir/rw/config/.vyatta_config ]; then
 
 		item=${dir##/mnt/tmp/boot/}
 		images=($item ${images[@]})
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index 7d58cd96..454ae749 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -155,7 +155,7 @@ echo "Installing \"$NEWNAME\" image."
 
 # create the new release directories
 REL_ROOT=$BOOT_DIR/$NEWNAME
-RW_DIR="$REL_ROOT/live-rw"
+RW_DIR="$REL_ROOT/rw"
 if ! mkdir -p "$RW_DIR"; then
   failure_exit 'Cannot create directory for new release.'
 fi
diff --git a/scripts/install/install-image-new b/scripts/install/install-image-new
index 32c5f3e4..d6427500 100755
--- a/scripts/install/install-image-new
+++ b/scripts/install/install-image-new
@@ -62,9 +62,9 @@ echo "OK.  This image will be named: $image_name"
 # make the dir for the new version 
 mkdir -p $WRITE_ROOT/boot/$image_name
 # make dir for backing store
-rw_dir=$WRITE_ROOT/boot/$image_name/live-rw
+rw_dir=$WRITE_ROOT/boot/$image_name/rw
 mkdir -p $rw_dir
-work_dir=$WRITE_ROOT/boot/$image_name/live-work
+work_dir=$WRITE_ROOT/boot/$image_name/work
 mkdir -p $work_dir
 
 echo Copying squashfs image...