diff --git a/config b/config index f9f35d0..8b64c0d 100644 --- a/config +++ b/config @@ -23,7 +23,7 @@ ## libdevuansdk configuration vars+=(release version mirror section) -arrs+=(core_packages base_packages system_packages) +arrs+=(core_packages base_packages) os="devuan" release="jessie" @@ -34,6 +34,7 @@ section="main" core_packages=( devuan_keyring debian_keyring + bzip2 initramfs-tools binutils ca-certificates @@ -45,15 +46,11 @@ core_packages=( ) base_packages=( - bzip2 dialog apt-utils fakeroot e2fsprogs parted -) - -system_packages=( - sysvinit ssh + sysvinit ) diff --git a/zlibs/bootstrap b/zlibs/bootstrap index 2836850..81b4e8d 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -99,13 +99,14 @@ EOF bootstrap_config_thirdstage() { fn bootstrap_config_thirdstage - req=(core_packages base_packages system_packages) + req=(core_packages base_packages) ckreq || return 1 cat << EOF #!/bin/sh dpkg-divert --add --local \ - --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d + --divert /usr/sbin/invoke-rc.d.chroot \ + --rename /usr/sbin/invoke-rc.d cp /bin/true /usr/sbin/invoke-rc.d echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d chmod +x /usr/sbin/policy-rc.d @@ -115,7 +116,7 @@ apt-get --yes --force-yes install locales-all debconf-set-selections /debconf.set apt-get update -apt-get -y install ${core_packages} +apt-get --yes --force-yes install ${core_packages} echo "root:${os}" | chpasswd sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' \ @@ -125,7 +126,6 @@ export DEBIAN_FRONTEND=noninteractive apt-get --yes --force-yes install \ ${base_packages} \ - ${system_packages} \ ${extra_packages} apt-get --yes --force-yes dist-upgrade apt-get --yes --force-yes autoremove