webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2023-09-17 12:20:33 +00:00
parent 13b04e6998 d1b4c380ef
commit f3d26496ac
6 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
config/extrahd/extrahd.pl
View File

@@ -35,10 +35,20 @@ extrahd_mount() {
local failed=0
while IFS=';' read -r device filesystem mountpoint rest; do
# Filter by mountpoint if set
if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
continue
fi
# Filter by UUID or mountpoint
case "${_mountpoint}" in
UUID=*)
if [ "${device}" != "${_mountpoint}" ]; then
continue
fi
;;
/*)
if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
continue
fi
;;
esac
# Check that the mountpoint starts with a slash
if [ "${mountpoint:0:1}" != "/" ]; then
@@ -75,10 +85,20 @@ extrahd_umount() {
local failed=0
while IFS=';' read -r device filesystem mountpoint rest; do
# Filter by mountpoint if set
if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
continue
fi
# Filter by UUID or mountpoint
case "${_mountpoint}" in
UUID=*)
if [ "${device}" != "${_mountpoint}" ]; then
continue
fi
;;
/*)
if [ -n "${_mountpoint}" ] && [ "${mountpoint}" != "${_mountpoint}" ]; then
continue
fi
;;
esac
# Do not try to umount if nothing is mounted
if ! mountpoint "${mountpoint}" &>/dev/null; then

1
config/rootfiles/common/udev
View File

@@ -70,6 +70,7 @@ lib/udev/rules.d/60-persistent-storage.rules
lib/udev/rules.d/60-persistent-v4l.rules
lib/udev/rules.d/60-sensor.rules
lib/udev/rules.d/60-serial.rules
lib/udev/rules.d/61-extrahd.rules
lib/udev/rules.d/64-btrfs.rules
lib/udev/rules.d/70-camera.rules
lib/udev/rules.d/70-joystick.rules

2
config/rootfiles/core/180/filelists/files
View File

@@ -4,6 +4,8 @@ etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/functions.network
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/red.up/99-pakfire-update
lib/udev/rules.d/61-extrahd.rules
opt/pakfire/lib/functions.pl
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/index.cgi
var/ipfire/main/manualpages

1
config/rootfiles/oldcore/179/filelists/files
View File

@@ -1,4 +1,5 @@
etc/rc.d/init.d/networking/red
lib/udev/rules.d/61-extrahd.rules
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi

1
config/udev/61-extrahd.rules Normal file
View File

@@ -0,0 +1 @@
ACTION=="add", SUBSYSTEM=="block", RUN+="/var/ipfire/extrahd/bin/extrahd.pl udev-event"

4
lfs/udev
View File

@@ -123,6 +123,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
/lib/udev/rules.d
# Install ExtraHD rules
install -v -m 644 $(DIR_SRC)/config/udev/61-extrahd.rules \
/lib/udev/rules.d
# Install AQM rules
install -v -m 644 $(DIR_SRC)/config/udev/99-aqm.rules \
/lib/udev/rules.d