X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=159bc2d135eb0f116804c7d96992d1fed07e6d10;hp=0172b2cb26d3bedc4c1b543eab96d03e03493401;hb=aa2ac45de12d32728735496784ebf7751bfbcf92;hpb=d19136186e7eeee7662985f0ffb0a2573262bb8a

diff --git a/postinst-setup b/postinst-setup
index 0172b2c..159bc2d 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -20,8 +20,7 @@ fi
 # completely
 cd /etc
 if [ ! -d /etc/.bzr ]; then
-    #for i in passwd group shadow fstab; do
-    for i in fstab; do
+    for i in passwd group shadow fstab; do
         [ -e $i.originst ] || cp $i $i.originst
     done
     [ -e /backup-etc ] || bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
@@ -29,8 +28,8 @@ 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 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*
@@ -40,16 +39,16 @@ if [ ! -d /etc/.bzr ]; then
     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
-    #    mv $i.originst $i
-    #done
+    for i in passwd group; do
+        perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst
+        mv $i.originst $i
+    done
 
     # only restore some passwords from shadow
-    #egrep 'martin|netti|joe' shadow >> shadow.originst
-    #mv shadow.originst shadow
-    #chown root:shadow shadow
-    #chmod 640 shadow
+    egrep 'martin|netti|joe' shadow >> shadow.originst
+    mv shadow.originst shadow
+    chown root:shadow shadow
+    chmod 640 shadow
 fi
 
 # update postfix for new configuration
@@ -62,7 +61,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-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*
 
@@ -70,8 +69,9 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || 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 dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core greasemonkey build-essential fakeroot devscripts 
-apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power
+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 libnotify-bin
+
+apt-get -y build-dep postgresql-9.0 cups apport calibre gvfs udisks upower gnome-disk-utility udev python-gobject
 
 # crontabs
 crontab -u martin - <<EOF
@@ -80,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