From 23157a8a3d2871c868f4d72ee863146fe9781778 Mon Sep 17 00:00:00 2001 From: Thomas Kaiser Date: Mon, 24 Jul 2017 17:46:25 +0200 Subject: [PATCH] [OMV] Some finetuning --- config/templates/customize-image.sh.template | 28 ++++++++++++++++--- .../fix-broken-bulk-streams.patch | 14 ++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 patch/kernel/odroidxu4-next/fix-broken-bulk-streams.patch diff --git a/config/templates/customize-image.sh.template b/config/templates/customize-image.sh.template index 89db0e9db9..40ac76776c 100644 --- a/config/templates/customize-image.sh.template +++ b/config/templates/customize-image.sh.template @@ -92,13 +92,24 @@ InstallOpenMediaVault() { wget https://github.com/OpenMediaVault-Plugin-Developers/packages/raw/master/openmediavault-omvextrasorg_latest_all3.deb -qO $FILE && dpkg -i $FILE /usr/sbin/omv-update # Netatalk performance fix + . /usr/share/openmediavault/scripts/helper-functions mkdir -p /var/lib/netatalk/CNID - # use folder2ram instead of log2ram with OMV + apt-get -y -q install openmediavault-netatalk + AFP_Options="mimic model = Macmini" + xmlstarlet ed -L -u "/config/services/afp/extraoptions" -v "$(echo -e "${AFP_Options}")" \ + /etc/openmediavault/config.xml + /usr/sbin/omv-mkconf netatalk + # use folder2ram instead of log2ram with OMV, configure services apt-get -y install openmediavault-flashmemory - sed -i -e '//,/<\/flashmemory>/ s/0/1/' \ - -e '//,/<\/ssh>/ s/0/1/' /etc/openmediavault/config.xml + xmlstarlet ed -L -u "/config/services/flashmemory/enable" -v "1" /etc/openmediavault/config.xml + xmlstarlet ed -L -u "/config/services/ssh/enable" -v "1" /etc/openmediavault/config.xml + xmlstarlet ed -L -u "/config/services/ntp/enable" -v "1" /etc/openmediavault/config.xml + xmlstarlet ed -L -u "/config/system/time/timezone" -v "UTC" /etc/openmediavault/config.xml sed -i '/^EOF$/itmpfs\t\t/var/lib/netatalk/CNID' /usr/share/openmediavault/mkconf/flashmemory /usr/sbin/omv-mkconf flashmemory + /usr/sbin/omv-mkconf ssh + /usr/sbin/omv-mkconf ntp + /usr/sbin/omv-mkconf timezone systemctl disable log2ram rm /etc/cron.daily/log2ram /sbin/folder2ram -enablesystemd @@ -121,6 +132,9 @@ InstallOpenMediaVault() { echo -e "OMV_CPUFREQUTILS_MAXSPEED=${MAX_SPEED}" >>/etc/default/openmediavault \ /usr/sbin/omv-rpc -u admin "perfstats" "set" \x27{"enable":false}\x27 \ /usr/sbin/omv-rpc -u admin "config" "applyChanges" \x27{ "modules": ["monit","rrdcached","collectd"],"force": true }\x27 \ + /usr/sbin/omv-mkconf monit \ + /usr/sbin/omv-mkconf rrdcached \ + /usr/sbin/omv-mkconf collectd \ lsusb | grep -q "0bda:8153" || sed -i "/r8152/d" /etc/modules \ lsusb | egrep -q "0b95:1790|0b95:178a|0df6:0072" || sed -i "/ax88179_178a/d" /etc/modules' /etc/init.d/firstrun sed -i '/systemctl\ disable\ firstrun/a \ @@ -131,9 +145,9 @@ InstallOpenMediaVault() { egrep -q "air|neo|zero" <<<${BOARD} && echo "overlays=usbhost0 usbhost2 usbhost3" >>/boot/armbianEnv.txt # some performance tuning: Samba, cpufreq behaviour, IO scheduling/priority - . /usr/share/openmediavault/scripts/helper-functions SMB_Options="min receivefile size = 16384\nwrite cache size = 524288\ngetwd cache = yes\nsocket options = TCP_NODELAY IPTOS_LOWDELAY" xmlstarlet ed -L -u "/config/services/smb/extraoptions" -v "$(echo -e "${SMB_Options}")" ${OMV_CONFIG_FILE} + /usr/sbin/omv-mkconf samba # Special treatment for ODROID-XU4 (and later Amlogic S912, RK3399 and other big.LITTLE # based devices). Move all NAS daemons to the big cores @@ -169,6 +183,12 @@ InstallOpenMediaVault() { wget https://raw.githubusercontent.com/mirror/smartmontools/master/drivedb.h -qO $FILE grep -q 'drivedb.h' $FILE && mv $FILE /var/lib/smartmontools/drivedb/drivedb.h && \ chmod 644 /var/lib/smartmontools/drivedb/drivedb.h + + # Filter out some log messages + echo ':msg, contains, "do ionice -c1" ~' >/etc/rsyslog.d/omv-armbian.conf + echo ':msg, contains, "action " ~' >>/etc/rsyslog.d/omv-armbian.conf + echo ':msg, contains, "netsnmp_assert" ~' >>/etc/rsyslog.d/omv-armbian.conf + echo ':msg, contains, "Failed to initiate sched scan" ~' >>/etc/rsyslog.d/omv-armbian.conf } # InstallOpenMediaVault Main "$@" diff --git a/patch/kernel/odroidxu4-next/fix-broken-bulk-streams.patch b/patch/kernel/odroidxu4-next/fix-broken-bulk-streams.patch new file mode 100644 index 0000000000..1782c6cabc --- /dev/null +++ b/patch/kernel/odroidxu4-next/fix-broken-bulk-streams.patch @@ -0,0 +1,14 @@ +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index 672751e..5108d2d 100644 +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -90,6 +90,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) + { + struct pci_dev *pdev = to_pci_dev(dev); + ++ /* https://github.com/hardkernel/linux/commit/c18781b1ef56a800572e8342488504e4e818013a#commitcomment-21996557 */ ++ xhci->quirks |= XHCI_BROKEN_STREAMS; ++ + /* Look for vendor-specific quirks */ + if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC && + (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK ||