From 81162a699bab334a5abe469c4e2ce71cf87bd734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 11 May 2017 22:00:59 +0200 Subject: [PATCH] Remove unused helper scripts --- linux/aux-tools/Makefile | 2 -- linux/aux-tools/prepare-volatile-img.sh | 25 ------------- linux/aux-tools/unbind-pci-device.sh | 48 ------------------------- qubes/config.py | 3 -- rpm_spec/core-dom0.spec | 2 -- 5 files changed, 80 deletions(-) delete mode 100755 linux/aux-tools/prepare-volatile-img.sh delete mode 100755 linux/aux-tools/unbind-pci-device.sh diff --git a/linux/aux-tools/Makefile b/linux/aux-tools/Makefile index 646de262..106e7e74 100644 --- a/linux/aux-tools/Makefile +++ b/linux/aux-tools/Makefile @@ -3,9 +3,7 @@ all: install: mkdir -p $(DESTDIR)/usr/lib/qubes - cp unbind-pci-device.sh $(DESTDIR)/usr/lib/qubes cp cleanup-dispvms $(DESTDIR)/usr/lib/qubes cp startup-misc.sh $(DESTDIR)/usr/lib/qubes - cp prepare-volatile-img.sh $(DESTDIR)/usr/lib/qubes cp block-cleaner-daemon.py $(DESTDIR)/usr/lib/qubes/ cp fix-dir-perms.sh $(DESTDIR)/usr/lib/qubes/ diff --git a/linux/aux-tools/prepare-volatile-img.sh b/linux/aux-tools/prepare-volatile-img.sh deleted file mode 100755 index 822affa9..00000000 --- a/linux/aux-tools/prepare-volatile-img.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -set -e - -if ! echo $PATH | grep -q sbin; then - PATH=$PATH:/sbin:/usr/sbin -fi - -FILENAME=$1 -ROOT_SIZE=$2 -SWAP_SIZE=$[ 1024 ] - -if [ -z "$ROOT_SIZE" -o -z "$FILENAME" ]; then - echo "Usage: $0 " - exit 1 -fi - -if [ -e "$FILENAME" ]; then - echo "$FILENAME already exists, not overriding" - exit 1 -fi - -umask 002 -TOTAL_SIZE=$[ $ROOT_SIZE + $SWAP_SIZE + 512 ] -truncate -s ${TOTAL_SIZE}M "$FILENAME" diff --git a/linux/aux-tools/unbind-pci-device.sh b/linux/aux-tools/unbind-pci-device.sh deleted file mode 100755 index f3839949..00000000 --- a/linux/aux-tools/unbind-pci-device.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# The Qubes OS Project, http://www.qubes-os.org -# -# Copyright (C) 2010 Joanna Rutkowska -# -# 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 the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# - -BDF=$1 -if [ x$BDF = x ] ; then - echo "usage: $0 " - exit 0 -fi -BDF=0000:$BDF -#echo -n "Binding device $BDF to xen-pciback..." -if [ -e /sys/bus/pci/drivers/pciback/$BDF ]; then - # Already bound to pciback - # Check if device not assigned to any RUNNING VM - XS_PATH=/local/domain/0/backend/pci - GREP_RE="^$XS_PATH/[0-9]*/[0-9]*/dev-[0-9]* = \"$BDF\"" - if xenstore-ls -f $XS_PATH 2> /dev/null | grep -q "$GREP_RE"; then - DOMID=`xenstore-ls -f $XS_PATH | grep "$GREP_RE"|cut -d/ -f7` - echo "ERROR: Device already attached to the running VM '`xl domname $DOMID`'" >&2 - exit 1 - fi - exit 0 -fi - -if [ -e /sys/bus/pci/devices/$BDF/driver/unbind ] ; then - echo -n $BDF > /sys/bus/pci/devices/$BDF/driver/unbind || exit 1 -fi -echo -n $BDF > /sys/bus/pci/drivers/pciback/new_slot || exit 1 -echo -n $BDF > /sys/bus/pci/drivers/pciback/bind || exit 1 -#echo ok diff --git a/qubes/config.py b/qubes/config.py index 99c8271e..0663f8dd 100644 --- a/qubes/config.py +++ b/qubes/config.py @@ -52,9 +52,6 @@ system_path = { 'qrexec_policy_dir': '/etc/qubes-rpc/policy', 'config_template_pv': '/usr/share/qubes/vm-template.xml', - - 'qubes_pciback_cmd': '/usr/lib/qubes/unbind-pci-device.sh', - 'prepare_volatile_img_cmd': '/usr/lib/qubes/prepare-volatile-img.sh', } vm_files = { diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 15555a1e..a4ea65a2 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -373,12 +373,10 @@ fi %dir %{python3_sitelib}/qubespolicy/glade %{python3_sitelib}/qubespolicy/glade/RPCConfirmationWindow.glade -/usr/lib/qubes/unbind-pci-device.sh /usr/lib/qubes/cleanup-dispvms /usr/lib/qubes/block-cleaner-daemon.py* /usr/lib/qubes/fix-dir-perms.sh /usr/lib/qubes/startup-misc.sh -/usr/lib/qubes/prepare-volatile-img.sh /usr/libexec/qubes/qubes-notify-tools /usr/libexec/qubes/qubes-notify-updates %{_unitdir}/qubes-block-cleaner.service