don't use system_packages anymore

This commit is contained in:
parazyd 2016-09-29 21:35:36 +02:00
parent 406ad45004
commit 076d7203ff
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
2 changed files with 7 additions and 10 deletions

9
config
View File

@ -23,7 +23,7 @@
## libdevuansdk configuration ## libdevuansdk configuration
vars+=(release version mirror section) vars+=(release version mirror section)
arrs+=(core_packages base_packages system_packages) arrs+=(core_packages base_packages)
os="devuan" os="devuan"
release="jessie" release="jessie"
@ -34,6 +34,7 @@ section="main"
core_packages=( core_packages=(
devuan_keyring devuan_keyring
debian_keyring debian_keyring
bzip2
initramfs-tools initramfs-tools
binutils binutils
ca-certificates ca-certificates
@ -45,15 +46,11 @@ core_packages=(
) )
base_packages=( base_packages=(
bzip2
dialog dialog
apt-utils apt-utils
fakeroot fakeroot
e2fsprogs e2fsprogs
parted parted
)
system_packages=(
sysvinit
ssh ssh
sysvinit
) )

View File

@ -99,13 +99,14 @@ EOF
bootstrap_config_thirdstage() { bootstrap_config_thirdstage() {
fn bootstrap_config_thirdstage fn bootstrap_config_thirdstage
req=(core_packages base_packages system_packages) req=(core_packages base_packages)
ckreq || return 1 ckreq || return 1
cat << EOF cat << EOF
#!/bin/sh #!/bin/sh
dpkg-divert --add --local \ 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 cp /bin/true /usr/sbin/invoke-rc.d
echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
chmod +x /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 debconf-set-selections /debconf.set
apt-get update apt-get update
apt-get -y install ${core_packages} apt-get --yes --force-yes install ${core_packages}
echo "root:${os}" | chpasswd echo "root:${os}" | chpasswd
sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' \ sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' \
@ -125,7 +126,6 @@ export DEBIAN_FRONTEND=noninteractive
apt-get --yes --force-yes install \ apt-get --yes --force-yes install \
${base_packages} \ ${base_packages} \
${system_packages} \
${extra_packages} ${extra_packages}
apt-get --yes --force-yes dist-upgrade apt-get --yes --force-yes dist-upgrade
apt-get --yes --force-yes autoremove apt-get --yes --force-yes autoremove