[1/3] extrahd: Rewrite the mount script in shell
Commit Message
This is probably a lot easier than calling all sorts of shell commands
from Perl.
The script has also changed that it will try to mount/umount all
configured mountpoints unless a specific mountpoint is being given.
An initscript will be needed to mount everything when the system is
booting up and umount everything on shutdown.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
config/extrahd/extrahd.pl | 173 ++++++++++++++++++++++----------------
1 file changed, 101 insertions(+), 72 deletions(-)
@@ -1,8 +1,8 @@
-#!/usr/bin/perl
+#!/bin/bash
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2023 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -19,75 +19,104 @@
# #
###############################################################################
-use strict;
-# enable only the following on debugging purpose
-# use warnings;
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my %extrahdsettings = ();
-my $ok = "true";
-my @devices = ();
-my @deviceline = ();
-my $deviceentry = "";
-my $devicefile = "/var/ipfire/extrahd/devices";
-my $fstab = "/var/ipfire/extrahd/fstab";
-
-### Values that have to be initialized
-$extrahdsettings{'PATH'} = '';
-$extrahdsettings{'FS'} = '';
-$extrahdsettings{'DEVICE'} = '';
-$extrahdsettings{'ACTION'} = '';
-
-open( FILE, "< $devicefile" ) or die "Unable to read $devicefile";
-@devices = <FILE>;
-close FILE;
-
-############################################################################################################################
-############################################################################################################################
-
-if ( "$ARGV[0]" eq "mount" ) {
- system("/bin/cp -f /etc/fstab $fstab");
-
- foreach $deviceentry (sort @devices)
- {
- @deviceline = split( /\;/, $deviceentry );
- if ( "$ARGV[1]" eq "$deviceline[2]" ) {
- print "Insert $deviceline[0] ($deviceline[1]) --> $deviceline[2] into /etc/fstab!\n";
- unless ( -d $deviceline[2] ) { system("/bin/mkdir -p $deviceline[2] && chmod 0777 $deviceline[2]"); }
- open(FILE, ">>$fstab");
- print FILE "$deviceline[0]\t$deviceline[2]\t$deviceline[1]\tdefaults\t0\t0\n";
- close(FILE);
- }
- }
-
- system("/bin/cp -f $fstab /etc/fstab");
- if ( `/bin/mount -a` ) {
- exit(0);
- } else {
- exit(1);
- }
-
-} elsif ( "$ARGV[0]" eq "umount" ) {
- system("/bin/umount $ARGV[1]");
- if ( ! `/bin/mount | /bin/fgrep $ARGV[1]` ) {
- system("/bin/cp -f /etc/fstab $fstab");
- system("/bin/fgrep -v $ARGV[1] <$fstab >/etc/fstab");
- print "Successfully umounted $ARGV[1].\n";
- exit(0);
- } else {
- print "Can't umount $ARGV[1].\n";
- exit(1);
- }
-
-} elsif ( "$ARGV[0]" eq "scanhd") {
- system("/usr/local/bin/scanhd $ARGV[1]");
-
-} else {
- print "Usage: $0 (mount|umount|scanhd) mountpoint\n";
+log() {
+ local message="${@}"
+
+ logger -t "extrahd" "${message}"
+}
+
+extrahd_mount() {
+ local _mountpoint="${1}"
+
+ local device
+ local filesystem
+ local mountpoint
+ local rest
+ 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
+
+ # Skip mounting if something is already mounted at the mountpoint
+ if mountpoint "${mountpoint}" &>/dev/null; then
+ continue
+ fi
+
+ # Ensure the mountpoint exists
+ mkdir --parents --mode=777 "${mountpoint}" &>/dev/null
+
+ if mount --types "${filesystem}" "${device}" "${mountpoint}"; then
+ log "Successfully mounted ${device} to ${mountpoint}"
+ else
+ log "Could not mount ${device} to ${mountpoint}: $?"
+ failed=1
+ fi
+ done < /var/ipfire/extrahd/devices
+
+ return ${failed}
+}
+
+extrahd_umount() {
+ local _mountpoint="${1}"
+
+ local device
+ local filesystem
+ local mountpoint
+ local rest
+ 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
+
+ # Umount and try lazy umount if failed
+ if umount --quiet --recursive "${mountpoint}" || \
+ umount --quiet --recursive --lazy "${mountpoint}"; then
+ log "Successfully umounted ${device} from ${mountpoint}"
+ else
+ log "Could not umount ${device} from ${mountpoint}: $?"
+ failed=1
+ fi
+ done < /var/ipfire/extrahd/devices
+}
+
+main() {
+ local command="${1}"
+ shift
+
+ local rc=0
+
+ case "${command}" in
+ mount)
+ extrahd_mount "${@}" || rc="${?}"
+ ;;
+ umount)
+ extrahd_umount "${@}" || rc="${rc}"
+ ;;
+ scanhd)
+ exec /usr/local/bin/scanhd "${@}"
+ ;;
+
+ # No command
+ "")
+ echo "${0}: No command given" >&2
+ rc=2
+ ;;
+
+ # Unknown command
+ *)
+ echo "${0}: Unsupported command: ${command}" >&2
+ rc=2
+ ;;
+ esac
+
+ return ${rc}
}
-############################################################################################################################
-############################################################################################################################
+# Call main()
+main "${@}" || exit ${?}