mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-20 08:09:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Initial btrfs boot device support

Browse Source 
- detect if boot device is btrfs or fall back to vfat
- set discard=async for btrfs
- correct permissions for NONVFAT boot after bzfirmware is mounted
This commit is contained in:
Christoph Hummer
2023-11-12 11:43:57 +01:00
committed by GitHub
parent 49b7df2d2d
commit cec8287c3f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
etc/rc.d/rc.S
View File

@@ -94,10 +94,16 @@ find_device() {
/bin/echo -n "waiting up to 30 sec for device with label $UNRAIDLABEL to come online ... "
find_device && /bin/echo "found $DEVICE" || abort "not found"
/bin/echo "Checking $DEVICE ..."
/sbin/fsck.fat -a -w $DEVICE 2>/dev/null
# detect filesystem from boot device
if /sbin/blkid -s TYPE $DEVICE | /bin/grep -q "btrfs" ; then
NONVFAT=true
/sbin/mount -v -t btrfs -o auto,rw,noatime,nodiratime,discard=async $DEVICE /boot || abort "cannot mount $DEVICE"
else
/bin/echo "Checking $DEVICE ..."
/sbin/fsck.fat -a -w $DEVICE 2>/dev/null
/sbin/mount -v -t vfat -o auto,rw,flush,noatime,nodiratime,dmask=77,fmask=177,shortname=mixed $DEVICE /boot || abort "cannot mount $DEVICE"
/sbin/mount -v -t vfat -o auto,rw,flush,noatime,nodiratime,dmask=77,fmask=177,shortname=mixed $DEVICE /boot || abort "cannot mo>
fi
# check initial files used to boot
bzcheck(){
@@ -155,6 +161,12 @@ else
[[ $RETVAL -gt 0 ]] && abort "failed to remount $UNRAIDROOT r/w with return value $RETVAL"
fi
# set permissions for non vfat boot on /boot
if [[ $NONVFAT == true ]]; then
/usr/bin/chown -R root:root /boot
/usr/bin/chmod -R 644 /boot
fi
# invoke testing hook (only for test versions)
. /etc/unraid-version
if [[ -f /boot/config/rc.S.extra && $version =~ beta ]]; then