diff options
-rwxr-xr-x | media-video/ffcat/files/ffcat | 2 | ||||
-rwxr-xr-x | sys-fs/dmc/files/dmc | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-video/ffcat/files/ffcat b/media-video/ffcat/files/ffcat index 972058f..caf40cc 100755 --- a/media-video/ffcat/files/ffcat +++ b/media-video/ffcat/files/ffcat | |||
@@ -63,7 +63,7 @@ X | |||
63 | close L; | 63 | close L; |
64 | 64 | ||
65 | die "Cannot run ffmpeg: $!" unless $pid = open3($W,$F,$F, | 65 | die "Cannot run ffmpeg: $!" unless $pid = open3($W,$F,$F, |
66 | $has_ffmpeg, "-f", 'concat', "-i", $list, @copy, '-y', $output); | 66 | $has_ffmpeg, '-f', 'concat', '-safe', '0', '-i', $list, @copy, '-y', $output); |
67 | } elsif ($has_mp4box) { | 67 | } elsif ($has_mp4box) { |
68 | my @args = (); | 68 | my @args = (); |
69 | for ( @ARGV ) { | 69 | for ( @ARGV ) { |
diff --git a/sys-fs/dmc/files/dmc b/sys-fs/dmc/files/dmc index 2a2febc..e3d03d8 100755 --- a/sys-fs/dmc/files/dmc +++ b/sys-fs/dmc/files/dmc | |||
@@ -111,8 +111,14 @@ X | |||
111 | # /media is a good idea because the desktop environments will show | 111 | # /media is a good idea because the desktop environments will show |
112 | # device icons for it and make it easy to use for GUI users. | 112 | # device icons for it and make it easy to use for GUI users. |
113 | # unfortunately it stops the automounter from doing its job. why? | 113 | # unfortunately it stops the automounter from doing its job. why? |
114 | if ( -w "/dev/shm" ) { | 114 | # |
115 | $media = "/dev/shm"; | 115 | # /dev/shm seemed like a good idea to not litter /mnt with lots |
116 | # of mount points, but then some process decided to delete files | ||
117 | # from RAM without paying attention to file system boundaries. WTF | ||
118 | # (apparently the sandbox rules excempt shm from protection...) | ||
119 | # | ||
120 | if ( -w "/mnt" ) { | ||
121 | $media = "/mnt"; | ||
116 | } else { | 122 | } else { |
117 | $media = "/tmp"; | 123 | $media = "/tmp"; |
118 | } | 124 | } |
@@ -445,7 +451,7 @@ dmc - Command line UX frontend to dm-crypt's cryptsetup with support for multipl | |||
445 | dmc -E <volume> # erase some or all passwords and keys | 451 | dmc -E <volume> # erase some or all passwords and keys |
446 | 452 | ||
447 | <size> may end in M for megabytes, G for gigabytes, T for terabytes... | 453 | <size> may end in M for megabytes, G for gigabytes, T for terabytes... |
448 | If <mountpath> is omitted, /dev/shm/<mapper> is created instead. | 454 | If <mountpath> is omitted, /mnt/<mapper> is created instead. |
449 | Combining action flags such as -c, -e and -d produces unuseful effects. | 455 | Combining action flags such as -c, -e and -d produces unuseful effects. |
450 | 456 | ||
451 | Options: | 457 | Options: |