From 16b02e24c2d954224fadd10c391848eaeaf987fe Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Fri, 8 Mar 2019 19:14:17 +0900 Subject: [PATCH] Perform resizefs for /opt/usr If device is encrypted, skip resizefs and fsck for /opt/usr. Change-Id: Ib563b522f8eef201aca4c7103a2166d576e7051a --- scripts/init.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/scripts/init.sh b/scripts/init.sh index 981eabb..5aa6840 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -24,12 +24,25 @@ then DATAFS=`/sbin/blkid -t PARTLABEL=system-data -o device` fi +USERFS=`/sbin/blkid -L user` +if [ x$USERFS = "x" ] +then + USERFS=`/sbin/blkid -t PARTLABEL=user -o device` +fi + NEED_RESIZEFS=1 +USERFS_ENCRYPTED=0 if [ x"$DATAFS" != "x" ] then /sbin/fsck -y $DATAFS /bin/mount $DATAFS /opt + # The device is being encrypted or encrypted. + if [ -e /opt/etc/.odeprogress -o -e /opt/etc/.ode_* ] + then + USERFS_ENCRYPTED=1 + fi + if [ -e /opt/var/.resizefs_done ] then NEED_RESIZEFS=0 @@ -64,6 +77,15 @@ then fi fi +if [ x"$USERFS" != "x" -a "$USERFS_ENCRYPTED" = "0" ] +then + if [ "$NEED_RESIZEFS" = "1" ] + then + /sbin/resize2fs -f $USERFS + fi + /sbin/fsck -y $USERFS +fi + if [ -e /sysroot/opt/sqsh_usr.img ] then if [ ! -d /sysroot/usr ] -- 2.7.4