postinst-setup: fix fstab restoring

[bin.git] / postinst-setup

diff --git a/postinst-setup b/postinst-setup
index 4de8316b5c1453bd1242ec8ac817e9a53eb338af..9680876400fcc8fe554f3b77c5b0597afa97cb89 100755 (executable)
--- a/postinst-setup
+++ b/postinst-setup
@@ -35,7 +35,7 @@ if [ ! -d /etc/.bzr ]; then
     chmod 600 /etc/ssh/ssh_*_key
 
     # only restore dchroot part into fstab
-    grep -A 200 "^# dchroots" fstab >> fstab.originst || true
+    grep -A 200 "^# sid chroot" fstab >> fstab.originst || true
     mv fstab.originst fstab
 
     # only restore the human users from passwd/group
@@ -67,7 +67,7 @@ locale-gen ru_RU ru_RU.UTF-8
 
 # remove packages that we do not need
 killall apt-get || true # cronjob goo
-apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-thai-tlwg || true
+apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-lao ttf-thai-tlwg update-motd || true
 
 rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
@@ -75,27 +75,17 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
-DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff grep-dctrl ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot
-apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
-
-if [ `hostname` = donald ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dhcp3-server ia32-libs texlive latex-beamer texlive-lang-german sane-utils
-fi
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm
+apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
 
 umount /cdrom || true
 
-# other setup
-if [ `hostname` = "donald" ]; then
-    ifdown eth1
-    ifup eth1
-    /etc/init.d/dhcp3-server restart
-
-    # crontabs
-    crontab -u martin - <<EOF
+# crontabs
+crontab -u martin - <<EOF
 # m h  dom mon dow   command
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
-fi
+
 if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
+    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
 fi