Browse Source

Drop legacy xen entry in fstab

Frédéric Pierret (fepitre) 3 years ago
parent
commit
e660c4a05f
4 changed files with 3 additions and 12 deletions
  1. 0 1
      filesystem/fstab
  2. 1 0
      vm-systemd/75-qubes-vm.preset
  3. 1 1
      vm-systemd/qubes-sysinit.service
  4. 1 10
      vm-systemd/qubes-sysinit.sh

+ 0 - 1
filesystem/fstab

@@ -10,5 +10,4 @@ tmpfs                   /dev/shm                tmpfs   defaults,size=1G
 devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
 sysfs                   /sys                    sysfs   defaults        0 0
 proc                    /proc                   proc    defaults        0 0
-xen                     /proc/xen               xenfs   defaults        0 0
 /dev/xvdi	/mnt/removable	auto noauto,user,rw 0 0

+ 1 - 0
vm-systemd/75-qubes-vm.preset

@@ -108,3 +108,4 @@ enable qubes-sync-time.timer
 # Disable useless Xen services in Qubes VM
 disable xenstored.service
 disable xenconsoled.service
+disable proc-xen.mount

+ 1 - 1
vm-systemd/qubes-sysinit.service

@@ -2,7 +2,7 @@
 Description=Init Qubes Services settings
 DefaultDependencies=no
 Before=sysinit.target
-After=proc-xen.mount systemd-modules-load.service qubes-db.service
+After=systemd-modules-load.service qubes-db.service
 
 [Service]
 Type=oneshot

+ 1 - 10
vm-systemd/qubes-sysinit.sh

@@ -17,7 +17,7 @@ if systemd_version_changed ; then
 fi
 
 # Wait for xenbus initialization
-while [ ! -e /dev/xen/xenbus ] && [ -e /proc/xen/xenbus ]; do
+while [ ! -e /dev/xen/xenbus ]; do
   sleep 0.1
 done
 
@@ -27,15 +27,6 @@ chmod 0775 /var/run/qubes
 mkdir -p /var/run/qubes-service
 mkdir -p /var/run/xen-hotplug
 
-# Set permissions to /proc/xen/xenbus, so normal user can talk to xenstore, to
-# open vchan connection. Note that new code uses /dev/xen/xenbus (which have
-# permissions set by udev), so this probably can go away soon
-chmod 666 /proc/xen/xenbus
-
-# Set permissions to /proc/xen/privcmd, so a user in qubes group can access
-chmod 660 /proc/xen/privcmd
-chgrp qubes /proc/xen/privcmd
-
 # Set default services depending on VM type
 is_appvm && DEFAULT_ENABLED=$DEFAULT_ENABLED_APPVM && touch /var/run/qubes/this-is-appvm
 is_netvm && DEFAULT_ENABLED=$DEFAULT_ENABLED_NETVM && touch /var/run/qubes/this-is-netvm