X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=6bc4f032303b37e37d71e00c41a1fbce1f94c622;hp=7dac672fa003df3b3cf35a327a44b1ba2d7d000d;hb=f3d0d49711385af0759c6b7a64d565d01c37fa7e;hpb=5761fe30125cfdda1e9c6300642da71600398b7a

diff --git a/postinst-setup b/postinst-setup
index 7dac672..6bc4f03 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -20,7 +20,7 @@ fi
 # completely
 cd /etc
 if [ ! -d /etc/.bzr ]; then
-    for i in passwd group shadow fstab; do
+    for i in passwd group shadow; do
         [ -e $i.originst ] || cp $i $i.originst
     done
     [ -e /backup-etc ] || bzr branch bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
@@ -34,10 +34,6 @@ if [ ! -d /etc/.bzr ]; then
     chmod 640 /etc/ssl/private/ssl-cert-*
     chown root:ssl-cert /etc/ssl/private/ssl-cert*
 
-    # only restore dchroot part into fstab
-    grep -A 200 "^#.*chroot" fstab >> fstab.originst || true
-    mv fstab.originst fstab
-
     # only restore the human users from passwd/group
     for i in passwd group; do
         perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst
@@ -69,10 +65,15 @@ apt-get purge -y --auto-remove hplip hplip-data printer-driver-hpijs printer-dri
 killall apt-get || true
 apt-get update
 
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap diffstat gtimelog libtool devhelp python3-doc manpages-dev weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt mutt editmoin lintian fakechroot ubuntu-dev-tools dput dchroot easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm bzr-buildpackage git-core build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet debootstrap wmctrl mumble libnotify-bin pbuilder svn-buildpackage pastebinit lptools openvpn pdfjam
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap diffstat gtimelog libtool devhelp python3-doc manpages-dev weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt mutt editmoin lintian fakechroot ubuntu-dev-tools dput easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm bzr-buildpackage git-core build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet debootstrap wmctrl mumble libnotify-bin svn-buildpackage pastebinit lptools openvpn pdfjam sbuild schroot
 
 apt-get -y --no-install-recommends build-dep postgresql-9.1 apport calibre gvfs udisks2 upower gnome-disk-utility udev pygobject
 
+# have schroot use tmpfs
+rmdir /var/lib/schroot/unpack /var/lib/schroot/union/overlay/
+ln -s /tmp /var/lib/schroot/unpack
+ln -s /tmp /var/lib/schroot/union/overlay
+
 # crontabs
 crontab -u martin - <<EOF
 # m h  dom mon dow   command