X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=44ab3500e241fe068282eaeb3365176775c70b1d;hp=c43964d770872f2ab9f0f7e90d9d888b4cd692c6;hb=343e156dfb61ceefd01f9d2245d0421fa0622c2e;hpb=f37682e0d9dd4cb224d6417d08cc42d918cc0ab0

diff --git a/postinst-setup b/postinst-setup
index c43964d..44ab350 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -1,13 +1,7 @@
 #!/bin/sh -e
 
-# move backup to /var
-if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
-    cp -a /home/martin/backup /var/backups/martin
-    rm -rf /home/martin/backup
-fi
-
 # need bzr and postfix for the setup below
-DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends postfix openssh-server bzr python-paramiko apt-cacher-ng
+DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends postfix openssh-server bzr python-paramiko apt-cacher-ng eatmydata
 
 # root's ssh stuff
 if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
@@ -31,29 +25,21 @@ if [ ! -d /etc/.bzr ]; then
     echo "none /tmp tmpfs defaults 0 0" >> /etc/fstab
 fi
 
-# set up apt-cacher-ng
-/etc/init.d/apt-cacher-ng stop
-mkdir -p /scratch/apt-cacher-ng
-sed -i '/^CacheDir:/ s!^.*!CacheDir: /scratch/apt-cacher-ng!' /etc/apt-cacher-ng/zz_debconf.conf
-chown -R apt-cacher-ng:apt-cacher-ng /scratch/apt-cacher-ng
-/etc/init.d/apt-cacher-ng start
-
 # update postfix for new configuration
 newaliases
 /etc/init.d/postfix restart
 
 # remove packages that we do not need
 killall apt-get || true # cronjob goo
-apt-get purge -y --auto-remove hplip hplip-data printer-driver-hpcups brltty bluez-cups gnome-accessibility-themes gnome-orca onboard thunderbird || true
+apt-get install -y linux-signed-image-generic
+apt-get purge -y --auto-remove hplip hplip-data printer-driver-hpcups brltty bluez-cups gnome-accessibility-themes gnome-orca onboard thunderbird deja-dup gnome-screensaver linux-headers-generic linux-generic || true
 
 # install packages from network sources
 killall apt-get || true
 apt-get update
 
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap diffstat gtimelog devhelp python3-doc manpages-dev weechat weechat-plugins weechat-scripts listadmin quilt mutt editmoin lintian ubuntu-dev-tools dput easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm qemu-utils bzr-buildpackage git build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet wmctrl libnotify-bin svn-buildpackage pastebinit lptools openvpn pdfjam sbuild schroot lxc exiv2 phablet-tools gstreamer1.0-plugins-ugly flashplugin-installer valgrind calibre
-# ccache
-
-apt-get -y --no-install-recommends build-dep calibre udisks2 upower systemd pygobject umockdev
+DEBIAN_FRONTEND=noninteractive eatmydata apt-get install --no-install-recommends -y --force-yes vim patchutils offlineimap diffstat gtimelog devhelp python3-doc manpages-dev weechat weechat-plugins weechat-scripts python-notify2 listadmin quilt mutt editmoin lintian ubuntu-dev-tools dput easytag texlive-lang-german texlive-latex-extra powertop qemu-kvm qemu-utils bzr-buildpackage git build-essential fakeroot devscripts libglib2.0-doc git-buildpackage d-feet libnotify-bin pastebinit lptools openvpn pdfjam sbuild schroot exiv2 gstreamer1.0-plugins-ugly gstreamer1.0-libav valgrind calibre autopkgtest
+eatmydata apt-get install -y lxc lxd pandoc lmodern texlive-fonts-recommended pep8 pyflakes pssh network-manager-openvpn-gnome i3-wm i3status
 
 # have schroot use tmpfs
 rmdir /var/lib/schroot/unpack /var/lib/schroot/union/overlay/
@@ -64,7 +50,7 @@ ln -s /tmp /var/lib/schroot/union/overlay
 echo "Setting up users"
 adduser martin sbuild
 if ! getent passwd joe > /dev/null; then
-    adduser --gecos "Joe" joe
+    adduser --gecos "Joe" --encrypt-home joe
     adduser joe audio
     adduser joe video
 fi