diff --git a/OARiNZ/DIY/LiveCD/Makefile.chroot b/OARiNZ/DIY/LiveCD/Makefile.chroot index 54e4651..a3d1408 100755 --- a/OARiNZ/DIY/LiveCD/Makefile.chroot +++ b/OARiNZ/DIY/LiveCD/Makefile.chroot @@ -13,11 +13,12 @@ APTGET_REM=$(APTGET) remove --purge --assume-yes APTGET_INS=$(APTGET) install --assume-yes DPKG=/usr/bin/dpkg +SED=/bin/sed -i -e # Packages to be removed using apt-get. Note that some additional # dependent packages will be automatically removed as well. -REM_MISC=diveintopython ubuntu-docs gaim gaim-data \ +REM_MISC=diveintopython gaim gaim-data \ screensaver-default-images sound-juicer totem-gstreamer \ totem-mozilla totem rhythmbox linux-headers-2.6.17-10 \ linux-headers-2.6.17-10-generic linux-headers-generic \ @@ -48,7 +49,7 @@ ADD_EPRINTS=apache2 mysql-server perl libapache2-mod-perl2 \ libunicode-string-perl libdbi-perl libdbd-mysql-perl \ libxml-parser-perl wget tar gzip unzip poppler-utils wv lynx \ - tetex-bin imagemagick adduser findutils exim4 + tetex-bin imagemagick adduser findutils sendmail ADD_WEBMIN=bash perl libnet-ssleay-perl openssl libauthen-pam-perl \ libpam-runtime libio-pty-perl libmd5-perl @@ -57,7 +58,7 @@ libexpect-perl libunicode-string-perl libhtml-parser-perl \ libmail-rfc822-address-perl libjson-perl -ADD_MISC=openssh-server +ADD_MISC=#openssh-server # Local packages to be installed using dpkg. @@ -99,7 +100,7 @@ $(APTGET_INS) $(ADD_EPRINTS) $(APTGET_INS) $(ADD_WEBMIN) $(APTGET_INS) $(ADD_ECONFIG) - $(APTGET_INS) $(ADD_MISC) +# $(APTGET_INS) $(ADD_MISC) dpkg-add: @@ -117,4 +118,6 @@ @echo "=== Cleaning up." $(APTGET) clean $(APTGET) autoclean - /bin/sed -i -e 's/NO_START=1/NO_START=0/' /etc/default/apache2 + $(SED) 's/NO_START=1/NO_START=0/' /etc/default/apache2 + $(SED) 's/root@ou075136/root@localhost/' /etc/mail/submit.cf \ + /etc/cron.d/sendmail