X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=a2afae01a8842ad24ceade844e398ca6fb74f6f8;hp=33c69264261025e451415beec000f6761a842423;hb=69789764b97df9fdb76f6f29c491c1ac2083e552;hpb=4caccf03892bcdc5a2ad931ab0b15696ec2d978b

diff --git a/postinst-setup b/postinst-setup
index 33c6926..a2afae0 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -6,13 +6,8 @@ if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then
     rm -rf /home/martin/backup
 fi
 
-# install already shipped debs
-UBUNTU_CD="/home/martin/download/ubuntu/`lsb_release -c`-alternate-`dpkg --print-architecture`.iso"
-if [ -r "$UBUNTU_CD" ]; then
-    mount -o loop "$UBUNTU_CD" /cdrom
-    apt-cdrom -m add
-fi
-DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko 
+# need bzr and postfix for the setup below
+DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends postfix openssh-server bzr python-paramiko 
 
 # root's ssh stuff
 if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
@@ -33,9 +28,14 @@ if [ ! -d /etc/.bzr ]; then
     cp -av /backup-etc/.bzr/ /etc/
     rm -rf /backup-etc
     chmod 600 /etc/ssh/ssh_*_key
+    chmod 640 /etc/shadow
+    chown root:shadow /etc/shadow
+    chmod 700 /etc/ssl/private
+    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 "^# sid chroot" fstab >> fstab.originst || true
+    grep -A 200 "^#.*chroot" fstab >> fstab.originst || true
     mv fstab.originst fstab
 
     # only restore the human users from passwd/group
@@ -55,30 +55,23 @@ fi
 newaliases
 /etc/init.d/postfix restart
 
-# copy apt cache
-if [ -d /home/aptcache ]; then
-    find /home/aptcache/ -name "*.deb" -exec cp '{}' /var/cache/apt/archives/ \;
-    rm -rf /home/aptcache
-fi
-
 # other setup
 dpkg -i /home/martin/download/libdvdcss2_*deb || true
 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-lao ttf-thai-tlwg update-motd || true
+apt-get purge -y --auto-remove hplip hplip-data hpijs brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-lao ttf-thai-tlwg || true
 
 rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
 # install packages from network sources
 killall apt-get || true
-apt-get update -o Acquire::Http::No-Cache=true
+apt-get update
 
-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
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools patchutils offlineimap wipe diffstat gtimelog libtool devhelp python-doc manpages-dev gstreamer0.10-fluendo-mp3 gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt cryptsetup 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 germinate debootstrap seahorse-plugins wmctrl mumble qemu-kvm flashplugin-installer
 
-umount /cdrom || true
+apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility udev python-gobject
 
 # crontabs
 crontab -u martin - <<EOF
@@ -87,5 +80,5 @@ crontab -u martin - <<EOF
 EOF
 
 if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
+    patch --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch
 fi