From 6ff749a13adb15cfdd8bf19fa214bfeaf09ae302 Mon Sep 17 00:00:00 2001
From: HW42 <hw42@ipsumj.de>
Date: Tue, 3 Feb 2015 04:36:55 +0100
Subject: [PATCH] debian: install fstab as normal config file

---
 Makefile                        |  4 ++--
 debian/qubes-core-agent.preinst | 24 ------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 0cd29e7..1b53112 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,6 @@ install-sysvinit:
 
 
 install-rh: install-systemd install-sysvinit
-	install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
-
 	install -D -m 0644 misc/qubes-r3.repo $(DESTDIR)/etc/yum.repos.d/qubes-r3.repo
 	install -d $(DESTDIR)/usr/share/glib-2.0/schemas/
 	install -m 0644 misc/org.gnome.settings-daemon.plugins.updates.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
@@ -102,6 +100,8 @@ install-rh: install-systemd install-sysvinit
 	install -m 0400 -D network/ip6tables $(DESTDIR)/usr/lib/qubes/init/ip6tables
 
 install-common:
+	install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
+
 	install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes
 
 	install -d $(DESTDIR)/var/lib/qubes
diff --git a/debian/qubes-core-agent.preinst b/debian/qubes-core-agent.preinst
index a6b96e2..fa05241 100755
--- a/debian/qubes-core-agent.preinst
+++ b/debian/qubes-core-agent.preinst
@@ -41,10 +41,6 @@ if [ "$1" = "install" ] ; then
     mkdir -p /lib/modules
     #mkdir -p -m 0700 /var/log/xen  # xen-utils-common should do this
 
-    if [ -e /etc/fstab ] ; then 
-        mv /etc/fstab /var/lib/qubes/fstab.orig
-    fi
-
     # --------------------------------------------------------------------------
     # Many Qubes scripts reference /bin/sh expecting the shell to be bash but
     # in Debian it is dash so some scripts will fail so force an alternate for
@@ -62,26 +58,6 @@ if [ "$1" = "install" ] ; then
     # --------------------------------------------------------------------------
     sed -i -e '/^mesg n/d' /root/.profile
 
-    # --------------------------------------------------------------------------
-    # Update /etc/fstab
-    # --------------------------------------------------------------------------
-    cat > /etc/fstab <<EOF
-/dev/mapper/dmroot /         ext4 defaults,noatime 1 1
-/dev/xvdc1 swap              swap    defaults 0 0
-
-/dev/xvdb /rw                ext4    noauto,defaults,discard 1 2
-/rw/home /home               none    noauto,bind,defaults 0 0
-
-tmpfs /dev/shm               tmpfs   defaults 0 0
-devpts /dev/pts              devpts  gid=5,mode=620 0 0
-proc /proc                   proc    defaults 0 0
-sysfs /sys                   sysfs   defaults 0 0
-xen /proc/xen                xenfs   defaults 0 0
-
-/dev/xvdi /mnt/removable     auto    noauto,user,rw 0 0
-/dev/xvdd /lib/modules       ext3    defaults 0 0
-EOF
-
     # --------------------------------------------------------------------------
     # User add / modifications
     # --------------------------------------------------------------------------