diff options
| -rw-r--r-- | system/kvm-kmod/README | 5 | ||||
| -rw-r--r-- | system/kvm-kmod/fixup_udev_rules.diff | 7 | ||||
| -rw-r--r-- | system/kvm-kmod/kvm-kmod.SlackBuild | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/system/kvm-kmod/README b/system/kvm-kmod/README index 0448c08d8eb2..5a0aaf1f9801 100644 --- a/system/kvm-kmod/README +++ b/system/kvm-kmod/README @@ -16,8 +16,3 @@ kvm-kmod updates the modules without overwriting the ones provided by Slackware. If you uninstall kvm-kmod, you will need to run 'depmod -a' to regenerate the modules.dep and map files to regain access to the Slackware provided versions. - -By default, this script uses the "users" group for determining who -has permission to use /dev/kvm, but if you prefer something else, -set KVMGROUP when running the script, e.g.: - KVMGROUP=wheel sh kvm-kmod.SlackBuild diff --git a/system/kvm-kmod/fixup_udev_rules.diff b/system/kvm-kmod/fixup_udev_rules.diff deleted file mode 100644 index c51f8fc66127..000000000000 --- a/system/kvm-kmod/fixup_udev_rules.diff +++ /dev/null @@ -1,7 +0,0 @@ ---- kvm-kmod-3.3.6.orig/scripts/65-kvm.rules 2012-05-14 12:55:51.000000000 -0600 -+++ kvm-kmod-3.3.6/scripts/65-kvm.rules 2012-05-17 05:34:28.507551599 -0600 -@@ -1,2 +1,3 @@ --KERNEL=="kvm", MODE="0660", GROUP="kvm" -+KERNEL=="kvm", GROUP="@KVMGROUP@", MODE="0660" -+KERNEL=="vhost-net", GROUP="@KVMGROUP@", MODE="0660" - ACTION=="add|change", SUBSYSTEM=="dmi", KERNEL=="id", RUN+="/bin/sh -c 'grep -q vmx /proc/cpuinfo && /sbin/modprobe kvm-intel; grep -q svm /proc/cpuinfo && /sbin/modprobe kvm-amd'" diff --git a/system/kvm-kmod/kvm-kmod.SlackBuild b/system/kvm-kmod/kvm-kmod.SlackBuild index efce63ee14ef..9a7eca677dd9 100644 --- a/system/kvm-kmod/kvm-kmod.SlackBuild +++ b/system/kvm-kmod/kvm-kmod.SlackBuild @@ -40,7 +40,6 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} KERNEL=${KERNEL:-$(uname -r)} -KVMGROUP=${KVMGROUP:-users} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -71,8 +70,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -sed "s,@KVMGROUP@,$KVMGROUP," $CWD/fixup_udev_rules.diff | patch -p1 || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --arch=$ARCH @@ -91,8 +88,8 @@ make install \ # Eliminate unused pkgconfig text file rm -r $PKG/usr/lib${LIBDIRSUFFIX} -# Move /etc/udev to /lib/udev -mv $PKG/etc/udev $PKG/lib +# Remove /etc/udev - this part is shipped with the qemu package +rm -rf $PKG/etc/udev # Make modprobe prefer the new modules in /lib/modules/$KERNEL/extra/ # We don't want to install this with a .new suffix, because we want it |