Merge pull request #3 from kalxas/systemd_fix

Systemd fix

bin/inchroot.sh

@@ -123,72 +123,72 @@ export USER_NAME
 
 ./setup.sh "$BUILD_MODE"
 ./install_services.sh
-./install_language.sh
-./install_mysql.sh
+# ./install_language.sh
+# ./install_mysql.sh
 ./install_java.sh
 ./install_apache2.sh
 ./install_tomcat6.sh
-./install_ipython.sh
-./install_django.sh
-
-./install_geoserver.sh
-./install_geomajas.sh
-./install_geonetwork.sh
-./install_deegree.sh
-./install_52nWPS.sh
-./install_kosmo.sh
-./install_udig.sh
-./install_openjump.sh
-./install_postgis.sh
-./install_osm.sh
-./load_postgis.sh
-./install_pgrouting.sh
-./install_sahana.sh
-./install_ushahidi.sh
-./install_mapserver.sh
-./install_mapbender3.sh
-./install_geokettle.sh
-./install_gmt.sh
-./install_grass7.sh
-./install_qgis.sh
-./install_qgis_mapserver.sh
-./install_saga.sh
-./install_mapnik.sh
-./install_mapproxy.sh
-./install_mapslicer.sh
-./install_marble.sh
-./install_opencpn.sh
-./install_prune.sh
-./install_viking.sh
-./install_zygrib.sh
-./install_liblas.sh
-./install_gpsdrive.sh
-./install_openlayers.sh
-./install_leaflet.sh
-./install_R.sh
-./install_ossim.sh
-./install_osgearth.sh
-./install_spatialite.sh
-./install_zoo-project.sh
-./install_52nSOS.sh
-./install_otb.sh
-./install_rasdaman.sh
-./install_tinyows.sh
-./install_pycsw.sh
-./install_geomoose.sh
-./install_mb-system.sh
-./install_gvsig.sh
-./install_tilemill.sh
-./install_eoxserver.sh
-./install_cartaro.sh
-./install_iris.sh
-./install_ncWMS.sh
-./install_geonode.sh
-./install_cesium.sh
-
-./load_gisdata.sh
-./install_docs.sh
-./install_edutools.sh
+# ./install_ipython.sh
+# ./install_django.sh
+
+# ./install_geoserver.sh
+# ./install_geomajas.sh
+# ./install_geonetwork.sh
+# ./install_deegree.sh
+# ./install_52nWPS.sh
+# ./install_kosmo.sh
+# ./install_udig.sh
+# ./install_openjump.sh
+# ./install_postgis.sh
+# ./install_osm.sh
+# ./load_postgis.sh
+# ./install_pgrouting.sh
+# ./install_sahana.sh
+# ./install_ushahidi.sh
+# ./install_mapserver.sh
+# ./install_mapbender3.sh
+# ./install_geokettle.sh
+# ./install_gmt.sh
+# ./install_grass7.sh
+# ./install_qgis.sh
+# ./install_qgis_mapserver.sh
+# ./install_saga.sh
+# ./install_mapnik.sh
+# ./install_mapproxy.sh
+# ./install_mapslicer.sh
+# ./install_marble.sh
+# ./install_opencpn.sh
+# ./install_prune.sh
+# ./install_viking.sh
+# ./install_zygrib.sh
+# ./install_liblas.sh
+# ./install_gpsdrive.sh
+# ./install_openlayers.sh
+# ./install_leaflet.sh
+# ./install_R.sh
+# ./install_ossim.sh
+# ./install_osgearth.sh
+# ./install_spatialite.sh
+# ./install_zoo-project.sh
+# ./install_52nSOS.sh
+# ./install_otb.sh
+# ./install_rasdaman.sh
+# ./install_tinyows.sh
+# ./install_pycsw.sh
+# ./install_geomoose.sh
+# ./install_mb-system.sh
+# ./install_gvsig.sh
+# ./install_tilemill.sh
+# ./install_eoxserver.sh
+# ./install_cartaro.sh
+# ./install_iris.sh
+# ./install_ncWMS.sh
+# ./install_geonode.sh
+# ./install_cesium.sh
+
+# ./load_gisdata.sh
+# ./install_docs.sh
+# ./install_edutools.sh
 
 ./install_desktop.sh
 ./install_icons_and_menus.sh

bin/setup.sh

@@ -80,12 +80,16 @@ apt-get -q update
 # work-around for ubu pkg breakage ver 204-5ubuntu20.2 (see trac #1334)
 sed -i -e 's/exit $?/exit 0/' \
    "/var/lib/dpkg/info/libpam-systemd:i386.prerm"
+sed -i -e 's/exit $?/exit 0/' \
+   "/var/lib/dpkg/info/libpam-systemd:amd64.prerm"
 service systemd-logind stop
 
 apt-get --yes install systemd-services
 
 sed -i -e 's/exit $?/exit 0/' \
    "/var/lib/dpkg/info/libpam-systemd:i386.postinst"
+sed -i -e 's/exit $?/exit 0/' \
+   "/var/lib/dpkg/info/libpam-systemd:amd64.postinst"
 
 apt-get --yes install libpam-systemd
 apt-get -f install --yes