Merge "changes for alpine compatibility"

This commit is contained in:
Zuul 2020-04-19 21:36:02 +00:00 committed by Gerrit Code Review
commit d0f8a75095
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,4 @@
#!/sbin/runscript
#!/sbin/openrc-run
# Copyright 1999-2016 Gentoo Foundation
# $Id$

View File

@ -37,7 +37,9 @@ if [ -n "$CONFIG_DRIVE_LABEL" ]; then
BLOCKDEV="$(blkid -L ${CONFIG_DRIVE_LABEL})"
TYPE="$(blkid -t LABEL=${CONFIG_DRIVE_LABEL} -s TYPE -o value)"
if [[ "${TYPE}" == 'vfat' ]]; then
mount -o umask=0077 "${BLOCKDEV}" /mnt/config || true
mount -t vfat -o umask=0077 "${BLOCKDEV}" /mnt/config || true
elif [[ "${TYPE}" == 'iso9660' ]]; then
mount -t iso9660 -o ro,mode=0700 "${BLOCKDEV}" /mnt/config || true
else
mount -o mode=0700 "${BLOCKDEV}" /mnt/config || true
fi