Skip to content

Commit a20afba

Browse files
committed
Fix systemd removal
1 parent 2e16d9f commit a20afba

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

debian-setup/debian-setup.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,9 @@ packages/openssh-server
204204
apt-get purge -qq apparmor
205205
printf 'Package: apparmor\nPin: release *\nPin-Priority: -1\n' >/etc/apt/preferences.d/apparmor.pref
206206

207+
# Static resolver configuration before removing systemd-resolved
208+
packages/_resolv_conf
209+
207210
# Optionally switch to SysVinit
208211
packages/systemd
209212

debian-setup/debian-setup2.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ packages/unattended-upgrades
8989
# Custom APT repository script
9090
Dinstall package/apt-add-repo.sh
9191

92-
# @FIXME
93-
#packages/ifupdown
94-
95-
packages/_resolv_conf
96-
9792
# Micro Name Service Caching
9893
packages/unscd
9994

debian-setup/packages/netplan.io

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cp -a /etc/network/interfaces /root/dist-mod/interfaces.netplan-stub
3333

3434
if [ "$(Netplan get-value "network.ethernets.${IFACE}.dhcp6" "false")" == "True" ]; then
3535
echo "auto ${IFACE}"
36-
echo "iface ${IFACE} inet6 dhcp"
36+
echo "iface ${IFACE} inet6 auto"
3737
echo
3838
fi
3939
done

debian-setup/packages/systemd

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,24 @@ if [ "$WITHOUT_SYSTEMD" == "yes" ]; then
77
# http://without-systemd.org/wiki/index.php/How_to_remove_systemd_from_a_Debian_jessie/sid_installation
88
if Is_installed systemd; then
99
packages/netplan.io
10-
Pkg_install_quiet sysvinit-core sysvinit-utils orphan-sysvinit-scripts bootlogd rsyslog
10+
# https://bugs-devel.debian.org/cgi-bin/bugreport.cgi?bug=1126941
11+
sed -i -e 's#cloud-init cloud-init-local#cloud-init-main cloud-init-local#' /etc/init.d/cloud-config
12+
Pkg_install_quiet --allow-remove-essential --purge \
13+
systemd-sysv- \
14+
sysv-rc sysvinit-core sysvinit-utils initscripts orphan-sysvinit-scripts bootlogd rsyslog
1115
cp /usr/share/sysvinit/inittab /etc/inittab
1216
# Change to agetty
1317
#sed -i -e 's|:/sbin/getty |:/sbin/agetty |' /etc/inittab
1418
# Disable terminals 2-6
1519
sed -i -e '/^\([2-6]\):23:respawn:\/sbin\/getty 38400 tty\1$/d' /etc/inittab
1620
# Prevent systemd from coming back
17-
printf 'Package: systemd*\nPin: release *\nPin-Priority: -1\n' >/etc/apt/preferences.d/systemd.pref
21+
printf 'Package: systemd-standalone-sysusers\nPin: release *\nPin-Priority: 500\n' >/etc/apt/preferences.d/systemd.pref
22+
printf '\nPackage: systemd*\nPin: release *\nPin-Priority: -1\n' >>/etc/apt/preferences.d/systemd.pref
1823
# Schedule removal of systemd
1924
{
2025
echo "PATH=/usr/sbin:/usr/bin"
2126
# Restart dbus
22-
echo "@reboot root killall -q dbus-daemon;service dbus start;apt-get purge -qq --auto-remove systemd >/dev/null && rm -f /etc/cron.d/withoutsystemd"
27+
echo "@reboot root killall -q dbus-daemon;service dbus start;apt-get purge -qq systemd >/dev/null && rm -f /etc/cron.d/withoutsystemd"
2328
} >/etc/cron.d/withoutsystemd
2429

2530
set +x

0 commit comments

Comments
 (0)