From 59cdd138781a336a27a8fb3b48cbf5664e93aeb0 Mon Sep 17 00:00:00 2001 From: "martin@piware.de" <> Date: Fri, 25 Jul 2008 15:11:12 +0200 Subject: [PATCH] postinst-setup: some updates for intrepid --- postinst-setup | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/postinst-setup b/postinst-setup index 34d7143..4de8316 100755 --- a/postinst-setup +++ b/postinst-setup @@ -12,13 +12,13 @@ if [ -r "$UBUNTU_CD" ]; then mount -o loop "$UBUNTU_CD" /cdrom apt-cdrom -m add fi -DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko +DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko # root's ssh stuff if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then mkdir -p /root/.ssh chmod 700 /root/.ssh - cp /home/martin/.ssh/id_dsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/ + cp /home/martin/.ssh/id_rsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/ fi # restore /etc bzr branch, rescue the files we do not want to restore @@ -28,7 +28,7 @@ if [ ! -d /etc/.bzr ]; then for i in passwd group shadow fstab; do [ -e $i.originst ] || cp $i $i.originst done - bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc + [ -e /backup-etc ] || bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc cp -av /backup-etc/* /etc/ cp -av /backup-etc/.bzr/ /etc/ rm -rf /backup-etc @@ -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-baekmuk ttf-gentium ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen 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-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-thai-tlwg || true rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp* @@ -75,11 +75,11 @@ 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 -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 +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 dchroot rsnapshot dhcp3-server ia32-libs easytag texlive latex-beamer texlive-lang-german fakechroot sane-utils imagemagick pngquant pdfjam + DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dhcp3-server ia32-libs texlive latex-beamer texlive-lang-german sane-utils fi umount /cdrom || true @@ -89,7 +89,6 @@ if [ `hostname` = "donald" ]; then ifdown eth1 ifup eth1 /etc/init.d/dhcp3-server restart - patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch # crontabs crontab -u martin - </dev/null EOF fi +if [ -x /usr/bin/gtimelog ]; then + patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch +fi -- 2.39.5