Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-dey: sync local checkroot.sh script with upstream's 

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-02-18 11:51:19 +01:00
parent 03e440ca9f
commit 0a7b0619d0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-digi-dey/recipes-core/initscripts/initscripts-1.0/checkroot.sh
View File

@ -22,7 +22,7 @@ test "$SULOGIN" = yes && sulogin -t 30 $CONSOLE
exec 9< /etc/fstab exec 9< /etc/fstab
rootmode=rw rootmode=rw
rootopts=rw rootopts=rw
rootcheck=no rootcheck=$ENABLE_ROOTFS_FSCK
swap_on_md=no swap_on_md=no
devfs= devfs=
while read fs mnt type opts dump pass junk <&9 while read fs mnt type opts dump pass junk <&9
@ -54,6 +54,16 @@ do
done done
exec 0>&9 9>&- exec 0>&9 9>&-
# Check for conflicting configurations
if [ "$rootmode" = "ro" -a "$ROOTFS_READ_ONLY" = "no" ] || \
[ "$rootmode" = "rw" -a "$ROOTFS_READ_ONLY" = "yes" ]; then
echo ""
echo "WARN: conflicting configurations in /etc/fstab and /etc/default/rcS"
echo " regarding the writability of rootfs. Please fix one of them."
echo ""
fi
# #
# Activate the swap device(s) in /etc/fstab. This needs to be done # Activate the swap device(s) in /etc/fstab. This needs to be done
# before fsck, since fsck can be quite memory-hungry. # before fsck, since fsck can be quite memory-hungry.