postinst-setup-fedora updates

[bin.git] / postinst-setup-fedora

diff --git a/postinst-setup-fedora b/postinst-setup-fedora
index 4058886a74956b24817dab65a374565e9a98cda8..5e6a0be5f3d7c7fc1fb63d78f24f728f78b587aa 100755 (executable)
--- a/postinst-setup-fedora
+++ b/postinst-setup-fedora
@@ -16,7 +16,8 @@ dnf install -y iwl6000g2a-firmware NetworkManager-wifi \
     qemu-kvm qemu-img openvpn mutt weechat pidgin-otr \
     simple-scan sane-backends sane-backends-drivers-scanners \
     pandoc texlive-beamer texlive-latex-bin texlive-collection-fontsrecommended \
-    texlive-hyphen-german texlive-hyphen-english texlive-fancyhdr \
+    texlive-hyphen-german texlive-hyphen-english texlive-fancyhdr texlive-dinbrief \
+    texlive-german \
     gnome-terminal firefox network-manager-applet evince shotwell rhythmbox \
     offlineimap gnome-keyring pinentry-gnome3 \
     postfix duplicity systemd-container gnome-disk-utility powertop \
@@ -27,26 +28,33 @@ dnf install -y iwl6000g2a-firmware NetworkManager-wifi \
 dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
 dnf install -y gstreamer1-{libav,plugins-{ugly,bad-free}} --setopt=strict=0
 
-# TODO: restore /etc git
+# restore /etc git branch
+if [ ! -d /etc/.git ]; then
+    [ -e /backup-etc ] || git clone git+ssh://martin@piware.de/home/martin/backup/`hostname`-etc-fedora/ /backup-etc
+    cp -av /backup-etc/* /etc/
+    cp -av /backup-etc/.git/ /etc/
+    rm -rf /backup-etc
+fi
+
 
 # other setup
-grep -q /ubuntu /etc/fstab || cat << EOF >> /etc/fstab
+grep -q lib/mock /etc/fstab || cat << EOF >> /etc/fstab
 
 tmpfs /var/tmp tmpfs defaults 0 0
 tmpfs /var/lib/mock tmpfs defaults 0 0
-/proc /ubuntu/proc none bind 0 0
-/sys /ubuntu/sys none bind 0 0
-/dev /ubuntu/dev none rbind 0 0
-/home /ubuntu/home none rbind 0 0
-/srv /ubuntu/srv none bind 0 0
-/tmp /ubuntu/tmp none bind 0 0
+#/proc /ubuntu/proc none bind 0 0
+#/sys /ubuntu/sys none bind 0 0
+#/dev /ubuntu/dev none rbind 0 0
+#/home /ubuntu/home none rbind 0 0
+#/srv /ubuntu/srv none bind 0 0
+#/tmp /ubuntu/tmp none bind 0 0
 EOF
 
-systemctl enable ubuntu-apt-cacher-ng
-
 # have schroot use tmpfs
-rmdir /var/lib/schroot/unpack
-ln -s /tmp /var/lib/schroot/unpack
+if [ ! -L /var/lib/schroot/unpack ]; then
+    rmdir /var/lib/schroot/unpack
+    ln -s /tmp /var/lib/schroot/unpack
+fi
 
 # root's ssh stuff
 if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then