From 5428fbcc427ed8a5b2da34f763c63a7d66aead1d Mon Sep 17 00:00:00 2001 From: Joshua Dye Date: Mon, 3 Dec 2018 21:09:43 -0500 Subject: [PATCH] committing changes in /etc after apt run Package changes: -lockfile-progs 0.1.18 armhf -usbmount 0.0.22 all --- .etckeeper | 6 --- usbmount/mount.d/00_create_model_symlink | 40 ----------------- usbmount/umount.d/00_remove_model_symlink | 23 ---------- usbmount/usbmount.conf | 53 ----------------------- 4 files changed, 122 deletions(-) delete mode 100755 usbmount/mount.d/00_create_model_symlink delete mode 100755 usbmount/umount.d/00_remove_model_symlink delete mode 100644 usbmount/usbmount.conf diff --git a/.etckeeper b/.etckeeper index 117ffd25..577e067a 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2217,12 +2217,6 @@ maybe chmod 0755 'update-motd.d' maybe chmod 0755 'update-motd.d/10-uname' maybe chmod 0644 'usb_modeswitch.conf' maybe chmod 0755 'usb_modeswitch.d' -maybe chmod 0755 'usbmount' -maybe chmod 0755 'usbmount/mount.d' -maybe chmod 0755 'usbmount/mount.d/00_create_model_symlink' -maybe chmod 0755 'usbmount/umount.d' -maybe chmod 0755 'usbmount/umount.d/00_remove_model_symlink' -maybe chmod 0644 'usbmount/usbmount.conf' maybe chmod 0644 'vdpau_wrapper.cfg' maybe chmod 0644 'verizon.conf' maybe chmod 0755 'vim' diff --git a/usbmount/mount.d/00_create_model_symlink b/usbmount/mount.d/00_create_model_symlink deleted file mode 100755 index 62707f10..00000000 --- a/usbmount/mount.d/00_create_model_symlink +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# This script creates the model name symlink in /var/run/usbmount. -# Copyright (C) 2005 Martin Dickopp -# -# This file is free software; the copyright holder gives unlimited -# permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -# -set -e - -# Replace spaces with underscores, remove special characters in vendor -# and model name. -UM_VENDOR=`echo "$UM_VENDOR" | sed 's/ /_/g; s/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-]//g'` -UM_MODEL=`echo "$UM_MODEL" | sed 's/ /_/g; s/[^0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-]//g'` - -# Exit if both vendor and model name are empty. -test -n "$UM_VENDOR" || test -n "$UM_MODEL" || exit 0 - -# Build symlink name. -if test -n "$UM_VENDOR" && test -n "$UM_MODEL"; then - name="${UM_VENDOR}_$UM_MODEL" -else - name="$UM_VENDOR$UM_MODEL" -fi - -# Append partition number, if any, to the symlink name. -partition=`echo "$UM_DEVICE" | sed 's/^.*[^0123456789]\([0123456789]*\)/\1/'` -if test -n "$partition"; then - name="${name}_$partition" -fi - -# If the symlink does not yet exist, create it. -test -e "/var/run/usbmount/$name" || ln -sf "$UM_MOUNTPOINT" "/var/run/usbmount/$name" - -exit 0 diff --git a/usbmount/umount.d/00_remove_model_symlink b/usbmount/umount.d/00_remove_model_symlink deleted file mode 100755 index 316385c6..00000000 --- a/usbmount/umount.d/00_remove_model_symlink +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# This script removes the model name symlink in /var/run/usbmount. -# Copyright (C) 2005 Martin Dickopp -# -# This file is free software; the copyright holder gives unlimited -# permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. -# -set -e - -ls /var/run/usbmount | while read name; do - if test "`readlink \"/var/run/usbmount/$name\" || :`" = "$UM_MOUNTPOINT"; then - rm -f "/var/run/usbmount/$name" - break - fi -done - -exit 0 diff --git a/usbmount/usbmount.conf b/usbmount/usbmount.conf deleted file mode 100644 index 5146186e..00000000 --- a/usbmount/usbmount.conf +++ /dev/null @@ -1,53 +0,0 @@ -# Configuration file for the usbmount package, which mounts removable -# storage devices when they are plugged in and unmounts them when they -# are removed. - -# Change to zero to disable usbmount -ENABLED=1 - -# Mountpoints: These directories are eligible as mointpoints for -# removable storage devices. A newly plugged in device is mounted on -# the first directory in this list that exists and on which nothing is -# mounted yet. -MOUNTPOINTS="/media/usb0 /media/usb1 /media/usb2 /media/usb3 - /media/usb4 /media/usb5 /media/usb6 /media/usb7" - -# Filesystem types: removable storage devices are only mounted if they -# contain a filesystem type which is in this list. -FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus" - -############################################################################# -# WARNING! # -# # -# The "sync" option may not be a good choice to use with flash drives, as # -# it forces a greater amount of writing operating on the drive. This makes # -# the writing speed considerably lower and also leads to a faster wear out # -# of the disk. # -# # -# If you omit it, don't forget to use the command "sync" to synchronize the # -# data on your disk before removing the drive or you may experience data # -# loss. # -# # -# It is highly recommended that you use the pumount command (as a regular # -# user) before unplugging the device. It makes calling the "sync" command # -# and mounting with the sync option unnecessary---this is similar to other # -# operating system's "safely disconnect the device" option. # -############################################################################# -# Mount options: Options passed to the mount command with the -o flag. -# See the warning above regarding removing "sync" from the options. -MOUNTOPTIONS="noexec,nodev,noatime,nodiratime" - -# Filesystem type specific mount options: This variable contains a space -# separated list of strings, each which the form "-fstype=TYPE,OPTIONS". -# -# If a filesystem with a type listed here is mounted, the corresponding -# options are appended to those specificed in the MOUNTOPTIONS variable. -# -# For example, "-fstype=vfat,gid=floppy,dmask=0007,fmask=0117" would add -# the options "gid=floppy,dmask=0007,fmask=0117" when a vfat filesystem -# is mounted. -FS_MOUNTOPTIONS="" - -# If set to "yes", more information will be logged via the syslog -# facility. -VERBOSE=no