Commit f5d78072 authored by Michael Biebl's avatar Michael Biebl
Browse files

Disable factory-reset feature and remove files associated with it

This feature needs more integration work first before it can be enabled
in Debian. E.g. Debian still uses a split /usr setup and a merged /usr is
a prerequisite for factory-reset to work properly.
Atm. it also leads to dependency cycles between keyboard-setup.service
and systemd-udev-hwdb-update.service.

This should be revisited for jessie+1.
parent 62ac10d3
......@@ -27,6 +27,9 @@ systemd (215-1) UNRELEASED; urgency=medium
* Order ifup@.service after networking.service so we don't need to setup the
runtime directory ourselves and we have a defined point during boot when
hotplugged network interfaces are started.
* Disable factory-reset feature and remove files associated with it. This
feature needs more integration work first before it can be enabled in
Debian.
-- Michael Biebl <biebl@debian.org> Tue, 26 Aug 2014 12:09:10 +0200
......
......@@ -23,6 +23,7 @@ CONFFLAGS = \
--disable-myhostname \
--disable-vconsole \
--disable-microhttpd \
--disable-sysusers \
--disable-silent-rules \
--with-ntp-servers="0.debian.pool.ntp.org 1.debian.pool.ntp.org 2.debian.pool.ntp.org 3.debian.pool.ntp.org" \
--with-system-uid-max=999 \
......@@ -119,12 +120,19 @@ override_dh_install:
rm -rf debian/install/*/etc/kernel/
rm -f debian/install/*/usr/lib/sysctl.d/50-default.conf
find debian/install/ -name '*.la' -delete
# Remove .so for deprecated compatibility libraries
# remove files related to factory-reset feature
find debian/install/ -name ldconfig.service -o \
-name systemd-journal-catalog-update.service -o \
-name systemd-udev-hwdb-update.service -o \
-name systemd-update-done.service -o \
-name systemd-update-done -o \
-name etc.conf -delete
# remove .so for deprecated compatibility libraries
rm -f debian/install/*/usr/lib/*/libsystemd-daemon.so
rm -f debian/install/*/usr/lib/*/libsystemd-login.so
rm -f debian/install/*/usr/lib/*/libsystemd-id128.so
rm -f debian/install/*/usr/lib/*/libsystemd-journal.so
# Remove symlinks enabling default-on services:
# remove symlinks enabling default-on services
rm -rf debian/install/*/etc/systemd/system/*.target.wants/
dh_install -pudev-udeb -plibudev1-udeb --sourcedir=debian/install/udeb
dh_install $(BOOTSTRAP_DH_FLAGS) -Nudev-udeb -Nlibudev1-udeb --sourcedir=debian/install/deb --fail-missing
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment