diff --git a/udevil/.md5sum b/udevil/.md5sum index b556505..1b75122 100644 --- a/udevil/.md5sum +++ b/udevil/.md5sum @@ -3,7 +3,8 @@ f46d62d33b6e37fb90ffcec7ea0af65a 6ac69ed255626192758ee851594928498d9c10de.patch 7cec124a76abea318af09a54ada9a920 83b1254c2f1d778577324a341d43b83aca129822.patch 9e7592b146fad3f02865fcba5686a34a 925fd6659fb7448ec96585bbf448c2e970b5ff04.patch +bf017ebd9b04cf05af7f267cc1ad9734 Makefile.pod2man 43bae6c6115fb5059e877bda642e2c61 device-info-sys-stat.patch -48cdefdf18d904c33f2a188534a02367 devmon.1 +70cdb486d8f69365c4fb964e4e2fc133 devmon.1.pod 281aa065d92c679cb41728069e72b272 udevil-0.4.4.tar.gz -570a3a1d2a73a67ff309a38ce90d2682 udevil.1 +810c2466ca4a01e8330cb6a8a6b61bce udevil.1.pod diff --git a/udevil/Makefile.pod2man b/udevil/Makefile.pod2man new file mode 100644 index 0000000..07becf6 --- /dev/null +++ b/udevil/Makefile.pod2man @@ -0,0 +1,9 @@ +all: devmon.1 udevil.1 + +%: %.pod + pod2man -r "udevil ${VERSION}" -c "" \ + -n $(basename $@) -s $(subst .,,$(suffix $@)) $< > $@ + +install: all + mkdir -p ${DESTDIR}${MANPREFIX}/man1 + cp -f devmon.1 udevil.1 ${DESTDIR}${MANPREFIX}/man1/ diff --git a/udevil/Pkgfile b/udevil/Pkgfile index 17a82a5..6c4250c 100644 --- a/udevil/Pkgfile +++ b/udevil/Pkgfile @@ -3,7 +3,7 @@ name=udevil version=0.4.4 -release=2 +release=3 source="$name-$version.tar.gz::https://github.com/IgnorantGuru/$name/archive/$version.tar.gz 3dacdad457b3d859993709f0181021ff0c2a865a.patch 4f79ba4233bcbe9a2c9b8a799cd9dedba9534eaf.patch @@ -11,8 +11,9 @@ source="$name-$version.tar.gz::https://github.com/IgnorantGuru/$name/archive/$ve 83b1254c2f1d778577324a341d43b83aca129822.patch 925fd6659fb7448ec96585bbf448c2e970b5ff04.patch device-info-sys-stat.patch - devmon.1 - udevil.1" + Makefile.pod2man + devmon.1.pod + udevil.1.pod" build() { for f in $SRC/*.patch; do @@ -31,5 +32,7 @@ build() { make V=1 make DESTDIR=$PKG install - install -m 0644 -Dt $PKG/usr/share/man/man1/ $SRC/*.1 + # install custom man pages + make -C $SRC -f Makefile.pod2man VERSION=$version \ + MANPREFIX=/usr/share/man DESTDIR=$PKG install } diff --git a/udevil/devmon.1 b/udevil/devmon.1 deleted file mode 100644 index e21ae5a..0000000 --- a/udevil/devmon.1 +++ /dev/null @@ -1,78 +0,0 @@ -.TH devmon "1" "March 2013" -.SH NAME -devmon \- Automounts and unmounts optical and removable drives -.SH SYNOPSIS -.B devmon [AUTOMOUNT-OPTIONS] # Run as daemon to automount -.B devmon [MOUNT-OPTIONS] # Or run as client to manually un/mount -.SH DESCRIPTION -\fBdevmon\fP - Automounts and unmounts optical and removable drives -.SH USAGE -.TP -.B AUTOMOUNT-OPTIONS: (these can be used only in daemon mode) -.B \-\-exec\-on\-device DEVICE "COMMAND" -Execute COMMAND after mounting DEVICE -.B \-\-exec-on-label "LABEL" "COMMAND" -Execute COMMAND after mounting LABEL -.B \-\-exec\-on\-video "COMMAND" -.B Execute COMMAND after video DVD mount -.B \-\-exec\-on\-audio "COMMAND" -Execute COMMAND after audio CD insertion -.B \-\-exec\-on\-disc "COMMAND" -Execute COMMAND after data CD/DVD mount -.B \-\-exec\-on\-drive "COMMAND" -Execute COMMAND after drive mount -.B \-\-exec\-on\-unmount "COMMAND" -Execute COMMAND after unmount -.B \-\-exec\-on\-remove "COMMAND" -Execute COMMAND after drive removal -.B Where the following in COMMAND will be replaced with: -.B %d mount point directory (eg /media/cd) -.B %f device name (eg /dev/sdd1) -.B %l label of mounted volume -.B Multiple -\-exec-on-XXX options may be used to execute multiple commands. -.B Other exec\-on\-XXX commands are ignored if exec\-on\-device or \-label executed. -.B \-\-mount-options "OPTIONS" -Default: noexec,nosuid,nodev,noatime -.B \-\-info-on-mount -Show mounted drive info in a popup dialog -.B \-\-no-mount -Don't mount anything, just exec (disables -\-exec\-on\-video) -.B \-\-no-unmount -Don't unmount all removable drives on exit -.TP -.B MOUNT-OPTIONS: (these can be used only in client mode) -.B \-\-unmount-removable, \-r -Sync and unmount all removable drives and show pop-up dialog -(spacefm or zenity required) -.B \-\-unmount-recent, \-c -Unmount most recently mounted removable drive -.B \-\-unmount-optical, \-o -Unmount all optical drives (error pop-up only) -.B \-\-unmount-all, \-u -Same as -\-unmount-removable, -\-unmount-optical -.B \-\-unmount DIR|DEVICE -Unmount DEVICE or mount point DIR -.B \-\-eject DIR|DEVICE -Unmount and eject DEVICE or mount point DIR -.B \-\-mount-all, \-a -Mount all removable and optical drives -.B \-\-mount DEVICE -Mount DEVICE -.B \-\-mount-options, \-\-mount-fstype, \-\-eject-options "OPTIONS" -These options will be passed to mount or eject -.TP -.B \-\-ignore-device DEVICE -Ignore DEVICE (eg /dev/sdd1) -.B \-\-ignore-label "LABEL" -Ignore volume with LABEL -.B \-\-sync, \-s -Add sync mount option for ext2-4 ntfs ufs, or flush for fat -& vfat (slower writing but safer) -.B \-\-internal -Also attempt to un/mount internal system drives -(this is mostly a fix for esata issues) -.B \-\-no-gui, \-g -Do not show spacefm/zenity pop-up dialogs -.SH AUTHOR -This manual page was written by Mateusz Łukasik , -for the Debian GNU/Linux system (but may be used by others). diff --git a/udevil/devmon.1.pod b/udevil/devmon.1.pod new file mode 100644 index 0000000..aef17a1 --- /dev/null +++ b/udevil/devmon.1.pod @@ -0,0 +1,205 @@ +=pod + +=encoding utf8 + +=head1 NAME + +devmon - automounts and unmounts optical and removable drives + +=head1 SYNOPSIS + +=over + +=item B: + +B [B] [B] + +=item B: + +B [B] [B] + +=back + +=head1 DESCRIPTION + +B is a configuration-less bash daemon script which automounts optical +discs and removable drives. +It can also selectively autostart apps or execute commands after mounting, +ignore specified devices and volume labels, and manually mount and unmount +devices. + +=head1 UNIVERSAL OPTIONS + +These can be used in both daemon and client modes: + +=over + +=item B<--ignore-device> I + +Ignore I (e.g. F). + +=item B<--ignore-label> "LABEL" + +Ignore volume with LABEL. + +=item B<--sync> | B<-s> + +Add sync mount option for ext2-4 ntfs ufs, or flush for fat & vfat (slower writing but safer). + +=item B<--internal> + +Also attempt to un/mount internal system drives (this is mostly a fix for esata issues). + +=item B<--always-exec> + +Also run B<--exec-on-XXX> commands during startup or with B<--mount-all>. + +=item B<--no-gui> | B<-g> + +Do not show spacefm/zenity pop-up dialogs. + +=back + +=head1 AUTOMOUNT OPTIONS + +These can be used only in daemon mode: + +=over + +=item B<--exec-on-device> I "COMMAND" + +Execute COMMAND after mounting DEVICE. + +=item B<--exec-on-label> "LABEL" "COMMAND" + +Execute COMMAND after mounting LABEL. + +=item B<--exec-on-video> "COMMAND" + +Execute COMMAND after video DVD mount. + +=item B<--exec-on-audio> "COMMAND" + +Execute COMMAND after audio CD insertion. + +=item B<--exec-on-disc> "COMMAND" + +Execute COMMAND after data CD/DVD mount. + +=item B<--exec-on-drive> "COMMAND" + +Execute COMMAND after drive mount. + +=item B<--exec-on-unmount> "COMMAND" + +Execute COMMAND after unmount. + +=item B<--exec-on-remove> "COMMAND" + +Execute COMMAND after drive removal. + +Where the following in COMMAND will be replaced with: + +=over + +=item B<%d> + +mount point directory (e.g. F) + +=item B<%f> + +device name (e.g. F) + +=item B<%l> + +label of mounted volume + +=back + +Multiple B<--exec-on-XXX> options may be used to execute multiple commands. +Other B commands are ignored if B or B<-label> executed. + +=item B<--mount-options> "OPTIONS" + +Default: noexec,nosuid,nodev,noatime + +=item B<--info-on-mount> + +Show mounted drive info in a popup dialog. + +=item B<--no-mount> + +Don't mount anything, just exec (disables B<--exec-on-video>). + +=item B<--no-unmount> + +Don't unmount all removable drives on exit. + +=back + +=head1 B + +These can be used only in client mode: + +=over + +=item B<--unmount-removable> | B<-r> + +Sync and unmount all removable drives and show pop-up dialog (spacefm or zenity required). + +=item B<--unmount-recent> | B<-c> + +Unmount most recently mounted removable drive. + +=item B<--unmount-optical> | B<-o> + +Unmount all optical drives (error pop-up only). + +=item B<--unmount-all> | B<-u> + +Same as B<--unmount-removable> B<--unmount-optical>. + +=item B<--unmount> I | I + +Unmount I or mount point I. + +=item B<--eject> I | I + +Unmount and eject I or mount point I. + +=item B<--mount-all> | B<-a> + +Mount all removable and optical drives. + +=item B<--mount> I + +Mount I. + +=item B<--mount-options> | B<--mount-fstype> | B<--eject-options> "OPTIONS" + +These options will be passed to mount or eject. + +=item B<--enumerate-device-files> + +List known devices. + +=back + +=head1 SEE ALSO + +=over + +=item L + +=item L + +Instruction and updates. + +=back + +=head1 AUTHORS + +This manual page was written by Alexandr Savca L +for Zeppe-Lin system (but may be used by others). + +=cut diff --git a/udevil/udevil.1 b/udevil/udevil.1 deleted file mode 100644 index ac422fc..0000000 --- a/udevil/udevil.1 +++ /dev/null @@ -1,87 +0,0 @@ -.TH udevil "1" "March 2013" -.SH NAME -udevil \- alternative storage media interface -.SH SYNOPSIS -.B udevil [OPTIONS] COMMAND [COMMAND-OPTIONS] [COMMAND-ARGUMENTS] -.SH DESCRIPTION -\fBudevil\fP - alternative storage media interface -udevil mounts and unmounts removable devices and network shares -without requiring password (set suid), shows device information -and monitors device changes. It includes the devmon automounting -script. -.SH EXAMPLES - udevil mount /dev/sdd1 - udevil mount -o ro,noatime /dev/sdd1 - udevil mount -o ro,noatime /dev/sdd1 /media/custom - udevil mount /tmp/example.iso # ISO file - udevil mount ftp://sys.domain # ftp site \- requires curlftpfs or ftpfs - udevil mount ftp://user:pass@sys.domain/share # ftp share with user and password - udevil mount ftp://user:pass@sys.domain:21/share # ftp share with port, user and password - udevil mount -t ftpfs sys.domain # ftp site with ftpfs - udevil mount -t curlftpfs sys.domain # ftp site with curl - udevil mount -t curlftpfs user:pass@sys.domain # ftp site with curl u/p - udevil mount nfs://sys.domain:/share # nfs share - udevil mount sys.domain:/share # nfs share - udevil mount smb://sys.domain/share # samba share w/ cifs - udevil mount smb://user:pass@10.0.0.1:50/share # samba share w/ u/p/port - udevil mount smb://WORKGROUP/user@sys.domain # samba share w/ workgroup - udevil mount //sys.domain/share # samba share w/ cifs - udevil mount //sys.domain/share -t smbfs # samba share w/ smbfs - udevil mount ssh://user@sys.domain # sshfs with user \- requires sshfs - udevil mount -t sshfs user@sys.domain # sshfs with user - udevil mount http://sys.domain/dav/ # WebDAV \- requires davfs2 - udevil mount tmpfs # make a ram drive - WARNING !!! a password on the command line is UNSAFE - see filesystem docs -.TP - udevil umount /dev/sdd1 - udevil umount /media/disk - udevil umount \-l /media/disk - udevil umount /tmp/example.iso -.TP - udevil info /dev/sdd1 -.TP - udevil monitor -.TP - udevil clean -.TP -.SH OPTIONS - \-\-verbose - print details - \-\-quiet - minimal output -.SH USAGE -.TP - MOUNT \- Mounts DEVICE to mount point DIR with MOUNT\-OPTIONS: - udevil mount|--mount [MOUNT-OPTIONS] [[\-b|-\-block-device] DEVICE] [DIR] - MOUNT\-OPTIONS: - \-\t|-\-types|-\-filesystem-type|-\-mount-fstype TYPE - (see man mount) - \-o|-\-options|-\-mount\-options OPT,... -(see man mount) - \-\-no\-user\-interaction ignored -(for compatibility) -.TP - udevil umount|unmount|-\-unmount|-\-umount [UNMOUNT-OPTIONS] - {[\-b|-\-block-device] DEVICE}|DIR - UNMOUNT-OPTIONS: - \-l -lazy unmount (see man umount) - \-f -force unmount (see man umount) - \-\-no-user-interaction -ignored (for compatibility) -.TP - INFO \- Show information about DEVICE emulating udisks v1 output: - udevil info|-\-show-info|-\-info [-b|-\-block-device] DEVICE -.TP - MONITOR \- Display device events emulating udisks v1 output: -udevil monitor|\-\-monitor -.TP - CLEAN \- Remove unmounted udevil-created mount dirs in media dirs - udevil clean -.TP -HELP - Show this help - udevil help|\-\-help|\-h -.SH AUTHOR -This manual page was written by Mateusz Łukasik , -for the Debian GNU/Linux system (but may be used by others). diff --git a/udevil/udevil.1.pod b/udevil/udevil.1.pod new file mode 100644 index 0000000..a8fd3f1 --- /dev/null +++ b/udevil/udevil.1.pod @@ -0,0 +1,217 @@ +=pod + +=encoding utf8 + +=head1 NAME + +udevil - mount, unmount, and monitor devices as a normal user + +=head1 SYNOPSIS + +B [B] B [B] [B] + +=head1 DESCRIPTION + +B mounts and unmounts removable devices and networks without a password +(set suid), shows device info, monitors device changes. Emulates mount's and +udisks's command line usage and udisks v1's output. Includes the L +automounting daemon. + +=head1 OPTIONS + +=over + +=item B<--verbose> + +Print details. + +=item B<--quiet> + +Minimal output. + +=back + +=head1 COMMANDS + +=over + +=item B | B<--mount> [I] [[B<-b> | B<--block-device>] I] [I] + +Mount I to mount point I with specified I. + +Mount options: + +=over + +=item B<-t> | B<--types> | B<--filesystem-type> | B<--mount-fstype> I + +See L manual page. + +=item B<-o> | B<--options> | B<--mount-options> I[,...] + +See L manual page. + +=item B<--no-user-interaction> + +Ignored (for compatibility). + +=back + +=item B | B | B<--umount> | B<--unmount> [I] {[B<-b> | B<--block-device>] I} | I + +Unmount I or I with I. + +Unmount options: + +=over + +=item B<-l> + +Lazy unmount. +See L manual page. + +=item B<-f> + +Force unmount. +See L manual page. + +=item B<--no-user-interaction> + +Ignored (for compatibility). + +=back + +=item B | B<--show-info> | B<--info> [B<-b> | B<--block-device>] I + +Show information about I emulating udisks v1 output. + +=item B | B<--monitor> + +Display device events emulating udisks v1 output. + +=item B + +Remove unmounted udevil-created mount dirs in media dirs. + +=item B | B<--help> | B<-h> + +Show help message. + +=back + +=head1 EXAMPLES + +=head2 Mount + +=over + +=item Generic: + + udevil mount /dev/sdd1 + udevil mount -o ro,noatime /dev/sdd1 + udevil mount -o ro,noatime /dev/sdd1 /media/usbdrive + +=item ISO file: + + udevil mount /tmp/example.iso + +=item FTP site (requires curlftpfs or ftpfs): + + udevil mount ftp://sys.domain + +=item FTP share with user and password: + + udevil mount ftp://user:pass@sys.domain/share + +=item FTP share with port, user and password: + + udevil mount ftp://user:pass@sys.domain:21/share + +=item FTP site with ftpfs: + + udevil mount -t ftpfs sys.domain + +=item FTP site with curl: + + udevil mount -t curlftpfs sys.domain + +=item FTP site with curl user and password: + + udevil mount -t curlftpfs user:pass@sys.domain + +=item NFS share: + + udevil mount nfs://sys.domain:/share + udevil mount sys.domain:/share + +=item SAMBA share with cifs: + + udevil mount smb://sys.domain/share + udevil mount //sys.domain/share + +=item SAMBA share with port, user and password: + + udevil mount smb://user:pass@10.0.0.1:50/share + +=item SAMBA share with workgroup: + + udevil mount smb://WORKGROUP/user@sys.domain + +=item SAMBA share with smbfs: + + udevil mount //sys.domain/share -t smbfs + +=item SSH with user (requires sshfs): + + udevil mount ssh://user@sys.domain + udevil mount -t sshfs user@sys.domain + +=item WebDAV (requires davfs2): + + udevil mount http://sys.domain/dav/ + +=item Make a RAM drive: + + udevil mount tmpfs + +=back + +=over + +=item B: + +A password on the command line is UNSAFE - see filesystem docs. + +=back + +=head2 Unmount + +=over + +=item Generic: + + udevil umount /dev/sdd1 + udevil umount /media/disk + udevil umount -l /media/disk + udevil umount /tmp/example.iso + +=back + +=head1 SEE ALSO + +=over + +=item L + +=item L + +Homepage. + +=back + +=head1 AUTHORS + +This manual page was written by Alexandr Savca L +for Zeppe-Lin system (but may be used by others). + +=cut