debian: Revert back to original NetworkManager, ModemManager service names

This commit is contained in:
Jason Mehring 2014-11-07 03:32:06 -05:00
parent 96887ea1b8
commit dbffe57bc9

View File

@ -170,23 +170,8 @@ case "$1" in
UNITDIR=/lib/systemd/system UNITDIR=/lib/systemd/system
OVERRIDEDIR=/usr/lib/qubes/init OVERRIDEDIR=/usr/lib/qubes/init
# XXX: Debian specific
if [ -f "$OVERRIDEDIR/NetworkManager.service" ]; then
mv -f $OVERRIDEDIR/NetworkManager.service $OVERRIDEDIR/network-manager.service
sed 's/NetworkManager/network-manager/' -i $OVERRIDEDIR/network-manager.service
fi
if [ -f "$OVERRIDEDIR/NetworkManager-wait-online.service" ]; then
mv -f $OVERRIDEDIR/NetworkManager-wait-online.service $OVERRIDEDIR/network-manager-wait-online.service
sed 's/NetworkManager/network-manager/' -i $OVERRIDEDIR/network-manager-wait-online.service
fi
if [ -f "$OVERRIDEDIR/ModemManager" ]; then
mv -f $OVERRIDEDIR/ModemManager $OVERRIDEDIR/modemmanager.service
sed 's/ModemManager/modemmanager/' -i $OVERRIDEDIR/modemmanager.service
fi
# Install overriden services only when original exists # Install overriden services only when original exists
#for srv in cups modemmanager network-manager network-manager-wait-online ntpd chronyd; do for srv in cups ModemManager NetworkManager NetworkManager-wait-online ntpd chronyd; do
for srv in cups modemmanager network-manager network-manager-wait-online; do
if [ -f $UNITDIR/$srv.service ]; then if [ -f $UNITDIR/$srv.service ]; then
cp $OVERRIDEDIR/$srv.service /etc/systemd/system/ cp $OVERRIDEDIR/$srv.service /etc/systemd/system/
fi fi