diff options
| author | John Ogness <john.ogness@linutronix.de> | 2019-01-28 13:09:56 +0106 |
|---|---|---|
| committer | John Ogness <john.ogness@linutronix.de> | 2019-01-28 20:25:24 +0106 |
| commit | 34d19fc6b1a814a9b65651980011d6a47af606d1 (patch) | |
| tree | 6b839a5266083ed029dc265726d8feca149d5897 | |
| parent | 35cff9185b355d7a471b5164b2235409e584dbfb (diff) | |
dd-multi: rename HOMEPT to EXTRAPT
Rename the variable representing the extra partition. Until now
this was /home but it will be changed to be an extra partition.
Signed-off-by: John Ogness <john.ogness@linutronix.de>
| -rwxr-xr-x | lx-trainer-vm/dd-multi.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lx-trainer-vm/dd-multi.sh b/lx-trainer-vm/dd-multi.sh index f74171d..01105aa 100755 --- a/lx-trainer-vm/dd-multi.sh +++ b/lx-trainer-vm/dd-multi.sh @@ -3,7 +3,7 @@ set -e # This script only supports GPT partitions for the lx-trainer image. ROOTPT=3 -HOMEPT=4 +EXTRAPT=4 usage_exit() { @@ -107,15 +107,15 @@ for dest in $DESTS; do echo "waiting for ${dest}${ROOTPT}..." sleep 1 done - while [ ! -b ${dest}${HOMEPT} ]; do - echo "waiting for ${dest}${HOMEPT}..." + while [ ! -b ${dest}${EXTRAPT} ]; do + echo "waiting for ${dest}${EXTRAPT}..." sleep 1 done done # create ext4 on home partition for dest in $DESTS; do - mkfs.ext4 -L lxhome ${dest}${HOMEPT} > /dev/null 2>&1 & + mkfs.ext4 -L lxhome ${dest}${EXTRAPT} > /dev/null 2>&1 & done wait @@ -128,16 +128,16 @@ echo "using directory $TMP_ROOT for mount points" for dest in $DESTS; do # create mountpoints mkdir -p ${TMP_ROOT}${dest}${ROOTPT} - mkdir -p ${TMP_ROOT}${dest}${HOMEPT} + mkdir -p ${TMP_ROOT}${dest}${EXTRAPT} # mount partitions mount ${dest}${ROOTPT} ${TMP_ROOT}${dest}${ROOTPT} - mount ${dest}${HOMEPT} ${TMP_ROOT}${dest}${HOMEPT} + mount ${dest}${EXTRAPT} ${TMP_ROOT}${dest}${EXTRAPT} # move home directories (if any) to home partition if [ -n "`ls ${TMP_ROOT}${dest}${ROOTPT}/home`" ]; then - echo "moving /home/* to ${dest}${HOMEPT}" - mv ${TMP_ROOT}${dest}${ROOTPT}/home/* ${TMP_ROOT}${dest}${HOMEPT}/ + echo "moving /home/* to ${dest}${EXTRAPT}" + mv ${TMP_ROOT}${dest}${ROOTPT}/home/* ${TMP_ROOT}${dest}${EXTRAPT}/ fi # setup home partition to be mounted as /home @@ -145,8 +145,8 @@ for dest in $DESTS; do tee -a ${TMP_ROOT}${dest}${ROOTPT}/etc/fstab > /dev/null # remount home to /home - umount ${TMP_ROOT}${dest}${HOMEPT} - mount ${dest}${HOMEPT} ${TMP_ROOT}${dest}${ROOTPT}/home + umount ${TMP_ROOT}${dest}${EXTRAPT} + mount ${dest}${EXTRAPT} ${TMP_ROOT}${dest}${ROOTPT}/home done # unpack layers (in parallel) |
