devuan-sdk
/
libdevuansdk
mirror of https://github.com/parazyd/libdevuansdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config merge

This commit is contained in:
Jaromil 2016-06-08 19:44:35 +02:00
parent ca24af741a
commit 53cb23a2c5
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config
View File

@ -40,13 +40,8 @@ section="main"
# core packages for the system
core_packages=(devuan-keyring debian-keyring)
<<<<<<< HEAD
core_packages+=(binutils ca-certificates curl)
core_packages+=(console-common less nano vim)
=======
core_packages+=(initramfs-tools binutils ca-certificates curl)
core_packages+=(locales console-common less nano vim)
>>>>>>> progress on iso making
core_packages+=(console-common less nano vim)
# base packages for the system
base_packages=(bzip2 dialog apt-utils fakeroot e2fsprogs parted)