summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2016-02-01 06:46:10 -0500
committerKim Hagen <kim.sidney@gmail.com>2016-02-01 06:46:10 -0500
commitf31619dc433d8e955cfe9c7abb6bcddb337e43cd (patch)
treeb02a85bb883a05595e71592bc8e252c77bf59017
parent47e2c43533abe96eca65f3906528c8654d5839b4 (diff)
downloadvyatta-cfg-system-f31619dc433d8e955cfe9c7abb6bcddb337e43cd.tar.gz
vyatta-cfg-system-f31619dc433d8e955cfe9c7abb6bcddb337e43cd.zip
Label disk on format and create persistence.conf file to get live-boot
to set the correct persistence.
-rwxr-xr-xscripts/install/install-get-partition2
-rwxr-xr-xscripts/install/install-image-new3
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index eee0dc73..b238f787 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -652,7 +652,7 @@ make_filesystem () {
lecho "Creating filesystem on /dev/$ldrive..."
progress_indicator start
- output=$(mkfs -t $ROOT_FSTYPE /dev/$ldrive 2>&1)
+ output=$(mkfs -L persistence -t $ROOT_FSTYPE /dev/$ldrive 2>&1)
status=$?
if [ "$status" != 0 ]; then
echo -e "Error: couldn't create the root filesystem.\nSee $INSTALL_LOG for further details.\nExiting..."
diff --git a/scripts/install/install-image-new b/scripts/install/install-image-new
index 81ac45e9..32c5f3e4 100755
--- a/scripts/install/install-image-new
+++ b/scripts/install/install-image-new
@@ -90,6 +90,9 @@ cp -p $squash_img $target_squash
echo Copying kernel and initrd images...
cp -dp $boot_files $WRITE_ROOT/boot/$image_name/
+# create persistence.conf file
+echo "/ union" > $WRITE_ROOT/persistence.conf
+
# set up union root for postinst
mkdir -p $INST_ROOT $READ_ROOT
if ! try_mount "-o loop,ro -t squashfs $target_squash $READ_ROOT"; then