summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3bd72cb)
Change-Id: Ibd6c82033e57e6e87df35390c0d1da914329b5be
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>
echo "Using A/B slot: ${P_SLOT}"
fi
echo "Using A/B slot: ${P_SLOT}"
fi
- PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device`
+ PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device -l`
if [ x$PART_ROOTFS = "x" ]
then
PART_ROOTFS=`/sbin/blkid -L rootfs`
fi
if [ x$PART_ROOTFS = "x" ]
then
PART_ROOTFS=`/sbin/blkid -L rootfs`
fi
- PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device`
+ PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device -l`
if [ x$PART_SYSTEM_DATA = "x" ]
then
PART_SYSTEM_DATA=`/sbin/blkid -L system-data`
fi
if [ x$PART_SYSTEM_DATA = "x" ]
then
PART_SYSTEM_DATA=`/sbin/blkid -L system-data`
fi
- PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device`
+ PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device -l`
if [ x$PART_RAMDISK = "x" ]
then
PART_RAMDISK=`/sbin/blkid -L ramdisk`
fi
if [ x$PART_RAMDISK = "x" ]
then
PART_RAMDISK=`/sbin/blkid -L ramdisk`
fi
- PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device`
+ PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device -l`
if [ x$PART_HAL = "x" ]
then
PART_HAL=`/sbin/blkid -L hal`
fi
if [ x$PART_HAL = "x" ]
then
PART_HAL=`/sbin/blkid -L hal`
fi
- PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
+ PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device -l || "$BLKID" --match-token LABEL=user -o device -l)
}
mount_bow_partition() {
}
mount_bow_partition() {
commit_f2fs_partition()
{
LABEL=${1}
commit_f2fs_partition()
{
LABEL=${1}
- PART_SYSTEM_DATA=$(blkid --match-token PARTLABEL="${LABEL}" -o device || blkid --match-token LABEL="${LABEL}" -o device)
+ PART_SYSTEM_DATA=$(blkid --match-token PARTLABEL="${LABEL}" -o device -l || blkid --match-token LABEL="${LABEL}" -o device -l)
"${MOUNT}" -o remount,checkpoint=enable "${PART_SYSTEM_DATA}"
log "[Info] Changes on partition ${LABEL} commited (f2fs)" "${INT_LOG_FILE}"
}
"${MOUNT}" -o remount,checkpoint=enable "${PART_SYSTEM_DATA}"
log "[Info] Changes on partition ${LABEL} commited (f2fs)" "${INT_LOG_FILE}"
}
echo "Using A/B slot: ${P_SLOT}"
fi
echo "Using A/B slot: ${P_SLOT}"
fi
- PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device`
+ PART_ROOTFS=`/sbin/blkid -t PARTLABEL=rootfs${P_SUFFIX} -o device -l`
if [ x$PART_ROOTFS = "x" ]
then
PART_ROOTFS=`/sbin/blkid -L rootfs`
fi
if [ x$PART_ROOTFS = "x" ]
then
PART_ROOTFS=`/sbin/blkid -L rootfs`
fi
- PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device`
+ PART_SYSTEM_DATA=`/sbin/blkid -t PARTLABEL=system-data -o device -l`
if [ x$PART_SYSTEM_DATA = "x" ]
then
PART_SYSTEM_DATA=`/sbin/blkid -L system-data`
fi
if [ x$PART_SYSTEM_DATA = "x" ]
then
PART_SYSTEM_DATA=`/sbin/blkid -L system-data`
fi
- PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device`
+ PART_RAMDISK=`/sbin/blkid -t PARTLABEL=ramdisk${P_SUFFIX} -o device -l`
if [ x$PART_RAMDISK = "x" ]
then
PART_RAMDISK=`/sbin/blkid -L ramdisk`
fi
if [ x$PART_RAMDISK = "x" ]
then
PART_RAMDISK=`/sbin/blkid -L ramdisk`
fi
- PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device`
+ PART_HAL=`/sbin/blkid -t PARTLABEL=hal${P_SUFFIX} -o device -l`
if [ x$PART_HAL = "x" ]
then
PART_HAL=`/sbin/blkid -L hal`
fi
if [ x$PART_HAL = "x" ]
then
PART_HAL=`/sbin/blkid -L hal`
fi
- PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device || "$BLKID" --match-token LABEL=user -o device)
+ PART_USER=$("$BLKID" --match-token PARTLABEL=user -o device -l || "$BLKID" --match-token LABEL=user -o device -l)
}
#------------------------------------------------
}
#------------------------------------------------