From ad71825bc02739ef71bcccef243692d81ae3fefd Mon Sep 17 00:00:00 2001 From: parazyd Date: Fri, 14 Oct 2016 02:32:15 +0200 Subject: [PATCH 01/21] begin adding documentation --- doc/Makefile | 18 ++++ doc/libdevuansdk.7.md | 48 ++++++++++ doc/nanodoc | 71 +++++++++++++++ doc/static/foot.html | 11 +++ doc/static/head.html | 199 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 347 insertions(+) create mode 100644 doc/Makefile create mode 100644 doc/libdevuansdk.7.md create mode 100755 doc/nanodoc create mode 100644 doc/static/foot.html create mode 100644 doc/static/head.html diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..67e972d --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,18 @@ +all: clean html man + +html: + @echo generating html... + @./nanodoc html + +man: + @echo generating manpages... + @./nanodoc man + +clean: + @echo cleaning... + @rm -rf html man nav.html + @sed -i -e 's:index.html">.*:html">NAME:' static/head.html + @sed -i -e 's:Subtitle">.*:Subtitle">DESC:' static/head.html + @sed -i -e 's:libdevuansdk-.*:libdevuansdk-VERSION:' static/foot.html + +.PHONY: all html man clean diff --git a/doc/libdevuansdk.7.md b/doc/libdevuansdk.7.md new file mode 100644 index 0000000..416b5f0 --- /dev/null +++ b/doc/libdevuansdk.7.md @@ -0,0 +1,48 @@ +index +===== + +`libdevuansdk` is a shell script library intended to unify the use and creation +of various functions spread throughout devuan's various sdks. + +devuan's sdks are designed to be used interactively from a terminal, as +well as from shell scripts. libdevuansdk uses the functionality of the +[zuper](https://github.com/dyne/zuper) zsh library, but it does not include +it. you are required to include it in your sdk. however, `libdevuansdk` +requires the following packages to be installed: + +``` +zsh debootstrap sudo kpartx cgpt xz-utils +``` + +## notes + +to support the development, you are welcome to open issues on problems and +bugs you encounter. open merge requests of patches or simply get involved +in other tasks evident on + +## acknowledgments + +Devuan's SDK was originally conceived during a period of residency at the +Schumacher college in Dartington, UK. Greatly inspired by the laborious and +mindful atmosphere of its wonderful premises. + +The Devuan SDK is Copyright (c) 2015-2016 by the Dyne.org Foundation + +Devuan SDK components are designed, written and maintained by: + +- Ivan J. +- Denis Roio +- Enzo Nicosia + +This source code is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the Free +Software Foundation, either version 3 of the License, or (at your option) +any later version. + +This software is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. + +You should have received a copy of the GNU General Public License along +with this source code. If not, see . diff --git a/doc/nanodoc b/doc/nanodoc new file mode 100755 index 0000000..d41f572 --- /dev/null +++ b/doc/nanodoc @@ -0,0 +1,71 @@ +#!/bin/sh +# Copyright (c) 2016 parazyd +# nanodoc is written and maintained by parazyd +# +# This file is part of arm-sdk +# +# This source code is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this source code. If not, see . + +org="parazyd | dyne.org" +name=libdevuansdk +version=2.0 +desc="common.lib.for.devuan.sdks" + +pages=" + libdevuansdk.7" + + +generate_manpages() { + for page in $pages; do + ronn -r --manual=$name --organization="$org" ${page}.md + done + + mkdir -p man/7 + mv *.7 man/7 +} + +generate_html() { + mkdir -p html + sed -i -e 's/NAME/'$name'/' -e 's/DESC/'$desc'/g' static/head.html + sed -i -e 's/VERSION/'$version'/' static/foot.html + + for page in $pages; do + pagetitle=$(sed 1q ${page}.md) + printf '
  • %s
    • \n' $page $pagetitle >> nav.html + done + + printf "
    \n" >> nav.html + + for page in $pages; do + printf "\thtml/%s\n" ${page} + cat static/head.html > html/${page}.html + cat nav.html >> html/${page}.html + python -m markdown ${page}.md >> html/${page}.html + cat static/foot.html >> html/${page}.html + + pagetitle=$(sed 1q ${page}.md) + sed -i -e 's/TITLE/'$pagetitle'/' html/${page}.html + sed -i -e 's/'$page'.html" class="notPage/'$page'.html" class="thisPage/' html/${page}.html + done + + ln -sf libdevuansdk.7.html html/index.html + #cat nav.html + rm -f nav.html +} + +case $1 in + man) generate_manpages && exit 0 ;; + html) generate_html && exit 0 ;; + *) exit 1 ;; +esac diff --git a/doc/static/foot.html b/doc/static/foot.html new file mode 100644 index 0000000..f8b3678 --- /dev/null +++ b/doc/static/foot.html @@ -0,0 +1,11 @@ + +
    + + + + + diff --git a/doc/static/head.html b/doc/static/head.html new file mode 100644 index 0000000..ce9fc29 --- /dev/null +++ b/doc/static/head.html @@ -0,0 +1,199 @@ + + + + + TITLE + + + + + + + +
    +
    \n" >> nav.html for page in $pages; do - printf "\thtml/%s\n" ${page} + printf "\thtml/%s\n" $page cat static/head.html > html/${page}.html cat nav.html >> html/${page}.html python -m markdown ${page}.md >> html/${page}.html cat static/foot.html >> html/${page}.html pagetitle=$(sed 1q ${page}.md) - sed -i -e 's/TITLE/'$pagetitle'/' html/${page}.html + sed -i -e 's/TITLE/'"$pagetitle"'/' html/${page}.html sed -i -e 's/'$page'.html" class="notPage/'$page'.html" class="thisPage/' html/${page}.html done From 97ded7552ae599e9c4fd15d75d97aa4e20868841 Mon Sep 17 00:00:00 2001 From: parazyd Date: Fri, 14 Oct 2016 09:57:50 +0200 Subject: [PATCH 06/21] add workflow stub --- doc/nanodoc | 9 +++++---- doc/workflow.7.md | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 doc/workflow.7.md diff --git a/doc/nanodoc b/doc/nanodoc index bac2b67..dcb2cf2 100755 --- a/doc/nanodoc +++ b/doc/nanodoc @@ -19,15 +19,16 @@ org="parazyd | dyne.org" name=libdevuansdk -version=2.0 -desc="common library for devuan's sdk" +version=0.2 +desc="common library for devuan's sdks" pages=" libdevuansdk.7 configuration.7 + workflow.7 helper_functions.7 - creating_wrappers.7" - + creating_wrappers.7 +" generate_manpages() { for page in $pages; do diff --git a/doc/workflow.7.md b/doc/workflow.7.md new file mode 100644 index 0000000..80cfc6b --- /dev/null +++ b/doc/workflow.7.md @@ -0,0 +1,4 @@ +libdevuansdk workflow +===================== + + From 331398ff51da55ffa126d3ecab1b1cc6578ef7d4 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 15 Oct 2016 00:46:21 +0200 Subject: [PATCH 07/21] install linux-firmware-free by default --- config | 1 + zlibs/bootstrap | 2 ++ 2 files changed, 3 insertions(+) diff --git a/config b/config index 9ab7620..0a1bbe1 100644 --- a/config +++ b/config @@ -59,6 +59,7 @@ base_packages=( wpasupplicant wireless-tools elinks + firmware-linux-free ) purge_packages=( diff --git a/zlibs/bootstrap b/zlibs/bootstrap index c70d730..d2352db 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -138,6 +138,7 @@ bootstrap_tar_pack() { #apt-get --yes --force-yes purge ${extra_packages} apt-get --yes --force-yes autoremove apt-get clean +rm -f /prepack EOF sudo chmod +x $strapdir/prepack || zerr @@ -181,6 +182,7 @@ apt-get --yes --force-yes upgrade apt-get --yes --force-yes install ${extra_packages} apt-get --yes --force-yes autoremove apt-get clean +rm -f /postunpack EOF dpkgdivert on $strapdir From b18b590b2cf9cc1d41bae798a36bcc29a07808f8 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 15 Oct 2016 10:36:37 +0200 Subject: [PATCH 08/21] fix typo in creating_wrappers(7) --- doc/creating_wrappers.7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/creating_wrappers.7.md b/doc/creating_wrappers.7.md index 64004ba..76a3da3 100644 --- a/doc/creating_wrappers.7.md +++ b/doc/creating_wrappers.7.md @@ -47,7 +47,7 @@ the [zuper](https://github.com/dyne/zuper) zsh library. just to be safe. * `$size` - This variable will hold the value in MB for `dd` to know how many zeroes it + This variable will hold the value in MiB for `dd` to know how many zeroes it should put in the raw image. ex: `size=1337` From d28e0a93f4561099adc6c270027ed3331ce44489 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sun, 16 Oct 2016 19:22:42 +0200 Subject: [PATCH 09/21] allow installation of custom debs --- zlibs/helpers | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/zlibs/helpers b/zlibs/helpers index bfa3db5..3f9a889 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -138,6 +138,28 @@ EOF dpkgdivert off $strapdir } +install-custdebs() { + fn install-custdebs + req=(R strapdir) + ckreq || return 1 + + sudo mkdir -p $strapdir/debs + sudo cp $CPVERBOSE -f $R/extra/custom-packages/*.deb $strapdir/debs/ + + cat < Date: Mon, 17 Oct 2016 17:52:00 +0200 Subject: [PATCH 10/21] add basic ISO creation support --- libdevuansdk | 1 + zlibs/bootstrap | 2 + zlibs/iso | 119 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 zlibs/iso diff --git a/libdevuansdk b/libdevuansdk index 4d77ff1..df78317 100644 --- a/libdevuansdk +++ b/libdevuansdk @@ -24,6 +24,7 @@ source $LIBPATH/config source $LIBPATH/zlibs/bootstrap source $LIBPATH/zlibs/helpers source $LIBPATH/zlibs/imaging +source $LIBPATH/zlibs/iso source $LIBPATH/zlibs/kernel source $LIBPATH/zlibs/rsync source $LIBPATH/zlibs/sysconf diff --git a/zlibs/bootstrap b/zlibs/bootstrap index d2352db..8225713 100644 --- a/zlibs/bootstrap +++ b/zlibs/bootstrap @@ -186,8 +186,10 @@ rm -f /postunpack EOF dpkgdivert on $strapdir + devprocsys mount $strapdir sudo chmod +x $strapdir/postunpack || zerr sudo -E chroot $strapdir /postunpack || zerr + devprocsys umount $strapdir dpkgdivert off $strapdir ## below typically used in arm-sdk diff --git a/zlibs/iso b/zlibs/iso new file mode 100644 index 0000000..f2fa85c --- /dev/null +++ b/zlibs/iso @@ -0,0 +1,119 @@ +#!/usr/bin/env zsh +# Copyright (c) 2016 Dyne.org Foundation +# libdevuansdk is maintained by Ivan J. +# +# This file is part of libdevuansdk +# +# This source code is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this source code. If not, see . + +## burn baby + +iso_prepare_strap() { + fn iso_prepare_strap + req=(strapdir) + ckreq || return 1 + + notice "preparing strapdir for livecd" + + cat < Date: Tue, 18 Oct 2016 12:05:22 +0200 Subject: [PATCH 11/21] add build_iso_dist() and dpkg diverts to 386/amd64 kernels --- zlibs/helpers | 16 ++++++++++++++++ zlibs/iso | 6 ++++-- zlibs/kernel | 4 ++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/zlibs/helpers b/zlibs/helpers index 3f9a889..622cc06 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -43,6 +43,22 @@ build_image_dist() { image_pack_dist || zerr } +build_iso_dist() { + fn build_iso_dist + req=(workdir strapdir os arch) + ckreq || return 1 + + notice "building complete iso image" + + bootstrap_complete_base || zerr + iso_prepare_strap || zerr + build_kernel_${arch} || zerr + iso_setup_isolinux || zerr + iso_write_isolinux_cfg || zerr + iso_squash_strap || zerr + iso_xorriso_build || zerr +} + devprocsys() { fn devprocsys "$@" local watdo="$1" diff --git a/zlibs/iso b/zlibs/iso index f2fa85c..ceb7992 100644 --- a/zlibs/iso +++ b/zlibs/iso @@ -34,8 +34,10 @@ apt-get --yes --force-yes autoremove apt-get clean rm -f /isoprep EOF + dpkgdivert on $strapdir sudo chmod +x $strapdir/isoprep sudo -E chroot $strapdir /isoprep + dpkgdivert off $strapdir } iso_setup_isolinux() { @@ -104,10 +106,10 @@ iso_xorriso_build() { isoname="${image_name}-live.iso" pushd $workdir - sudo xorriso -as mkisofs -r -J -joliet-long -l -cache-inodes \ + sudo xorriso -as mkisofs -r -J -joliet-long -l \ -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ -partition_offset 16 \ - -a "${os} Live - ${arch}" \ + -A "${os} Live - ${arch}" \ -b isolinux/isolinux.bin \ -c isolinux/boot.cat \ -no-emul-boot \ diff --git a/zlibs/kernel b/zlibs/kernel index 09059a8..b5802f5 100644 --- a/zlibs/kernel +++ b/zlibs/kernel @@ -30,12 +30,14 @@ build_kernel_amd64() { notice "installing stock kernel for $arch" + dpkgdivert on $strapdir devprocsys mount $strapdir sudo chroot $strapdir \ apt-get --yes --force-yes install $kernel devprocsys umount $strapdir + dpkgdivert off $strapdir } build_kernel_i386() { @@ -49,10 +51,12 @@ build_kernel_i386() { notice "installing stock kernel for $arch" + dpkgdivert on $strapdir devprocsys mount $strapdir sudo chroot $strapdir \ apt-get --yes --force-yes install $kernel devprocsys umount $strapdir + dpkgdivert off $strapdir } From eef09941ede7e778c57b37ebbf17dd8199be7dcc Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 18 Oct 2016 13:53:59 +0200 Subject: [PATCH 12/21] document workflow --- doc/workflow.7.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/doc/workflow.7.md b/doc/workflow.7.md index 80cfc6b..569df8c 100644 --- a/doc/workflow.7.md +++ b/doc/workflow.7.md @@ -1,4 +1,32 @@ libdevuansdk workflow ===================== +Working with libdevuansdk splits into categories of what you want to do. +`zlibs` are files separated into these "categories": +## bootstrap + +Contains the functions for the bootstrap process. Creating a minimal debootstrap +base, and making it into a tarball for later use so you don't have to wait for +the debootstrap on every build. + +## helpers + +Contains the helper functions for libdevuansdk that make your and my life a bit +easier. + +## imaging + +Contains the functions necessary for creating raw dd-able images. + +## kernel + +Contains the functions for installing a vanilla kernel. + +## rsync + +Contains rsync functions + +## sysconf + +Contains the default system configuration. From cc56423e35a499d1037b49b9d18c836cc4f3cab8 Mon Sep 17 00:00:00 2001 From: parazyd Date: Wed, 19 Oct 2016 13:06:57 +0200 Subject: [PATCH 13/21] switch to vesamenu; add installer --- config | 3 +++ zlibs/helpers | 1 + zlibs/iso | 26 +++++++++++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/config b/config index 0a1bbe1..40dc557 100644 --- a/config +++ b/config @@ -60,6 +60,9 @@ base_packages=( wireless-tools elinks firmware-linux-free + btrfs-tools + zsh + rsync ) purge_packages=( diff --git a/zlibs/helpers b/zlibs/helpers index 622cc06..337de24 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -55,6 +55,7 @@ build_iso_dist() { build_kernel_${arch} || zerr iso_setup_isolinux || zerr iso_write_isolinux_cfg || zerr + [[ $INSTALLER = 1 ]] && iso_setup_installer iso_squash_strap || zerr iso_xorriso_build || zerr } diff --git a/zlibs/iso b/zlibs/iso index ceb7992..ed3efb4 100644 --- a/zlibs/iso +++ b/zlibs/iso @@ -19,6 +19,8 @@ ## burn baby +[[ $INSTALLER = 1 ]] && base_packages+=(grub-pc) + iso_prepare_strap() { fn iso_prepare_strap req=(strapdir) @@ -53,13 +55,10 @@ iso_setup_isolinux() { sudo cp $CPVERBOSE $strapdir/boot/vmlinuz* binary/live/vmlinuz sudo cp $CPVERBOSE $strapdir/boot/initrd* binary/live/initrd - ## TODO: check if others are worth adding - sudo cp $CPVERBOSE /usr/lib/ISOLINUX/isolinux.bin binary/isolinux/ - sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/elf.c32 binary/isolinux/ - sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/ldlinux.c32 binary/isolinux/ - sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/libutil.c32 binary/isolinux/ - sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/linux.c32 binary/isolinux/ - sudo cp $CPVERBOSE /usr/lib/syslinux/modules/bios/menu.c32 binary/isolinux/ + sudo cp $CPVERBOSE /usr/share/live/build/bootloaders/isolinux/isolinux.bin \ + binary/isolinux + sudo cp $CPVERBOSE /usr/share/live/build/bootloaders/isolinux/*.c32 \ + binary/isolinux popd } @@ -70,7 +69,7 @@ iso_write_isolinux_cfg() { notice "writing isolinux configuration" cat < Date: Wed, 26 Oct 2016 16:27:10 +0200 Subject: [PATCH 14/21] add enserv and disserv; enables or disables init services --- zlibs/helpers | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/zlibs/helpers b/zlibs/helpers index 337de24..2a429ec 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -138,6 +138,38 @@ EOF sudo -E chroot $werdo /dpkgdivert || zerr } +enableserv() { + fn enableserv "$@" + local service="$1" + req=(service strapdir) + ckreq || return 1 + + cat < Date: Wed, 26 Oct 2016 16:33:12 +0200 Subject: [PATCH 15/21] add blends to image_dist --- zlibs/helpers | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zlibs/helpers b/zlibs/helpers index 2a429ec..47a222f 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -36,9 +36,11 @@ build_image_dist() { ## TODO: add blend_prebuild; blend_midbuild; blend_postbuild bootstrap_complete_base || zerr + [[ $BLEND = 1 ]] && blend_preinst || zerr image_prepare_raw || zerr image_partition_raw_${parted_type} || zerr build_kernel_${arch} || zerr + [[ $BLEND = 1 ]] && blend_postinst || zerr rsync_to_raw_image || zerr image_pack_dist || zerr } From 7229f49ab7ccf7db69da96db94ca6c27895496b4 Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 31 Oct 2016 08:23:25 +0100 Subject: [PATCH 16/21] manpages to man7 --- doc/nanodoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/nanodoc b/doc/nanodoc index dcb2cf2..0cd95c0 100755 --- a/doc/nanodoc +++ b/doc/nanodoc @@ -35,8 +35,8 @@ generate_manpages() { ronn -r --manual="$name" --organization="$org" ${page}.md done - mkdir -p man/7 - mv *.7 man/7 + mkdir -p man/man7 + mv *.7 man/man7 } generate_html() { From dd5d5d9d368854d9493941e39f61b471eccd5762 Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 31 Oct 2016 08:41:56 +0100 Subject: [PATCH 17/21] regenerate ssh keys on first boot --- zlibs/helpers | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/zlibs/helpers b/zlibs/helpers index 47a222f..9868204 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -53,11 +53,13 @@ build_iso_dist() { notice "building complete iso image" bootstrap_complete_base || zerr + [[ $BLEND = 1 ]] && blend_preinst || zerr iso_prepare_strap || zerr build_kernel_${arch} || zerr iso_setup_isolinux || zerr iso_write_isolinux_cfg || zerr [[ $INSTALLER = 1 ]] && iso_setup_installer + [[ $BLEND = 1 ]] && blend_postinst || zerr iso_squash_strap || zerr iso_xorriso_build || zerr } @@ -181,6 +183,43 @@ enablessh() { #!/bin/sh sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config update-rc.d ssh enable +chmod +x /etc/init.d/regensshkeys +update-rc.d regensshkeys defaults +update-rc.d regensshkeys enable +EOF + + cat < Date: Mon, 31 Oct 2016 09:49:53 +0100 Subject: [PATCH 18/21] add blend_name to image_name if it's available --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 40dc557..9c28462 100644 --- a/config +++ b/config @@ -29,6 +29,7 @@ mirror="http://auto.mirror.devuan.org/merged" section="main" image_name="${os}_${release}_${version}_${arch}" +[[ -n $blend_name ]] && image_name="${image_name}_${blend_name}" [[ -n $device_name ]] && image_name="${image_name}_${device_name}" core_packages=( From f29200198e6c5c176b3061e460f9a38816af76ac Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 31 Oct 2016 11:48:42 +0100 Subject: [PATCH 19/21] add blend vars to globals --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config b/config index 9c28462..17a45dc 100644 --- a/config +++ b/config @@ -19,8 +19,8 @@ ## libdevuansdk configuration -vars+=(release version mirror section) -arrs+=(core_packages base_packages purge_packages) +vars+=(release version mirror section blend_name) +arrs+=(core_packages base_packages purge_packages blend_packages) os="devuan" release="jessie" From 5f988be6b8d97341e2d1bbda542f71684a4f3f26 Mon Sep 17 00:00:00 2001 From: parazyd Date: Mon, 31 Oct 2016 16:08:53 +0100 Subject: [PATCH 20/21] install git-core by default --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 17a45dc..c873741 100644 --- a/config +++ b/config @@ -64,6 +64,7 @@ base_packages=( btrfs-tools zsh rsync + git-core ) purge_packages=( From 75a22f11347e7ae3049cc35b7d3df797dacae0c7 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sun, 13 Nov 2016 12:47:28 +0100 Subject: [PATCH 21/21] fix ssh reconfigure --- zlibs/helpers | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zlibs/helpers b/zlibs/helpers index 9868204..d9e0c4d 100644 --- a/zlibs/helpers +++ b/zlibs/helpers @@ -193,8 +193,8 @@ EOF # ### BEGIN INIT INFO # Provides: something -# Required-Start: $syslog -# Required-Stop: $syslog +# Required-Start: \$syslog +# Required-Stop: \$syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Regenerate openssh-server keys @@ -211,13 +211,13 @@ genkeys() { /usr/sbin/update-rc.d regensshkeys disable } -case "$1" in +case "\$1" in start) - genkeys + genkeys;; stop) ;; *) - echo "usage: $(basename $0) {start}" + echo "usage: \$(basename \$0) {start}" ;; esac EOF