renaming of zlibs
now organized as name of file -> first prefix on functions to reflect also the tools/actions of reference bootstrap, isolinux, kernel, qemu, sysconf eliminated generic "customize" name, obsoleted imaging
This commit is contained in:
Jaromil
parent
aa56b84ad9
commit
e3c0e5595b
10
libdevuansdk
10
libdevuansdk
|
|
@ -56,12 +56,14 @@ vars+=(R H E)
|
|||
vars+=(name_default)
|
||||
# source $R/zlibs/library
|
||||
source $E/config
|
||||
source $R/zlibs/debootstrap
|
||||
source $R/zlibs/bootstrap
|
||||
source $R/zlibs/helpers
|
||||
source $R/zlibs/imaging
|
||||
source $R/zlibs/iso
|
||||
# source $R/zlibs/imaging
|
||||
source $R/zlibs/isolinux
|
||||
source $R/zlibs/kernel
|
||||
source $R/zlibs/qemu
|
||||
source $R/zlibs/sysconf
|
||||
source $R/zlibs/customise
|
||||
|
||||
|
||||
|
||||
# conclude initialization
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
#!/usr/bin/env zsh
|
||||
#
|
||||
# Copyright (c) 2016 Dyne.org Foundation
|
||||
# libdevuansdk is written and maintained by
|
||||
# Jaromil <jaromil@dyne.org>
|
||||
# KatolaZ <katolaz@freaknet.org>
|
||||
# parazyd <parazyd@dyne.org>
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
grub_install_target_dev(){
|
||||
fn grub_install_target_dev $@
|
||||
root=$1
|
||||
install_dev=$2
|
||||
req=(root install_dev)
|
||||
freq=($root/.done $root/dev/pts/0)
|
||||
ckreq || return 1
|
||||
|
||||
# TODO: should we use qemu-chroot here for $arch = arm (parazyd?)
|
||||
sudo chroot ${root} apt-get install --assume-yes --no-install-recommends grub-common
|
||||
if [[ ! -d ${root}/boot/grub ]]; then
|
||||
sudo mkdir ${root}/boot/grub
|
||||
fi
|
||||
|
||||
ztmp
|
||||
devicemap=$ztmpfile
|
||||
|
||||
cat > ${devicemap} <<EOF
|
||||
(hd0) /dev/loop0
|
||||
EOF
|
||||
sudo cp ${devicemap} ${root}/boot/grub/device.map
|
||||
sudo chroot ${root} grub-mkconfig -o /boot/grub/grub.cfg
|
||||
## we now tamper with grub.cfg, to remove all references to
|
||||
## loopback devices...
|
||||
## FIXME!!! This is a hack...
|
||||
sudo -- sed -r -i -e 's/.*loop.*//g' ${root}/boot/grub/grub.cfg
|
||||
|
||||
sudo grub-install --root-directory=${root} --no-floppy \
|
||||
--modules="ext2 part_msdos" ${install_dev}
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
#!/usr/bin/env zsh
|
||||
#
|
||||
# Copyright (c) 2016 Dyne.org Foundation
|
||||
# libdevuansdk is written and maintained by
|
||||
# Jaromil <jaromil@dyne.org>
|
||||
# KatolaZ <katolaz@freaknet.org>
|
||||
# parazyd <parazyd@dyne.org>
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
kernel_x86_install_default(){
|
||||
fn kernel_x86_install_default $@
|
||||
req=(strapdir os release version arch)
|
||||
root=$strapdir
|
||||
freq=($root/.done)
|
||||
reqck || return 1
|
||||
|
||||
local kernel_base=linux-image
|
||||
local kernel=""
|
||||
|
||||
case $arch in
|
||||
amd64)
|
||||
kernel=${kernel_base}-amd64
|
||||
;;
|
||||
i386)
|
||||
kernel=${kernel_base}-586
|
||||
;;
|
||||
*)
|
||||
error "Architecture ::1 arch:: is not supported!!!" ${arch}
|
||||
zerr; zshexit
|
||||
;;
|
||||
esac
|
||||
|
||||
notice "Installing stock kernel for ::1 arch:: (::2 kernel::)" $arch $kernel
|
||||
|
||||
mountdevprocsys ${root}
|
||||
|
||||
sudo chroot ${root} apt-get --yes --force-yes --no-install-recommends install $kernel
|
||||
|
||||
umountdevprocsys ${root}
|
||||
notice "default kernel installed"
|
||||
}
|
||||
|
|
@ -21,73 +21,6 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this source code. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
### customise
|
||||
|
||||
kernel_x86_install_default(){
|
||||
fn kernel_x86_install_default $@
|
||||
req=(strapdir os release version arch)
|
||||
root=$strapdir
|
||||
freq=($root/.done)
|
||||
reqck || return 1
|
||||
|
||||
local kernel_base=linux-image
|
||||
local kernel=""
|
||||
|
||||
case $arch in
|
||||
amd64)
|
||||
kernel=${kernel_base}-amd64
|
||||
;;
|
||||
i386)
|
||||
kernel=${kernel_base}-586
|
||||
;;
|
||||
*)
|
||||
error "Architecture ::1 arch:: is not supported!!!" ${arch}
|
||||
zerr; zshexit
|
||||
;;
|
||||
esac
|
||||
|
||||
notice "Installing stock kernel for ::1 arch:: (::2 kernel::)" $arch $kernel
|
||||
|
||||
mountdevprocsys ${root}
|
||||
|
||||
sudo chroot ${root} apt-get --yes --force-yes --no-install-recommends install $kernel
|
||||
|
||||
umountdevprocsys ${root}
|
||||
notice "default kernel installed"
|
||||
}
|
||||
|
||||
grub_install_target_dev(){
|
||||
fn grub_install_target_dev $@
|
||||
root=$1
|
||||
install_dev=$2
|
||||
req=(root install_dev)
|
||||
freq=($root/.done $root/dev/pts/0)
|
||||
ckreq || return 1
|
||||
|
||||
# TODO: should we use qemu-chroot here for $arch = arm (parazyd?)
|
||||
sudo chroot ${root} apt-get install --assume-yes --no-install-recommends grub-common
|
||||
if [[ ! -d ${root}/boot/grub ]]; then
|
||||
sudo mkdir ${root}/boot/grub
|
||||
fi
|
||||
|
||||
ztmp
|
||||
devicemap=$ztmpfile
|
||||
|
||||
|
||||
cat > ${devicemap} <<EOF
|
||||
(hd0) /dev/loop0
|
||||
EOF
|
||||
sudo cp ${devicemap} ${root}/boot/grub/device.map
|
||||
sudo chroot ${root} grub-mkconfig -o /boot/grub/grub.cfg
|
||||
## we now tamper with grub.cfg, to remove all references to
|
||||
## loopback devices...
|
||||
## FIXME!!! This is a hack...
|
||||
sudo -- sed -r -i -e 's/.*loop.*//g' ${root}/boot/grub/grub.cfg
|
||||
|
||||
sudo grub-install --root-directory=${root} --no-floppy \
|
||||
--modules="ext2 part_msdos" ${install_dev}
|
||||
}
|
||||
|
||||
|
||||
qemu_make_img(){
|
||||
|
||||
|
|
@ -21,43 +21,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this source code. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
## Default system configuration
|
||||
|
||||
conf_install_grub() {
|
||||
fn conf_install_grub $@
|
||||
chrootpath="$1"
|
||||
req=(chrootpath)
|
||||
ckreq || return 1
|
||||
|
||||
notice "Installing grub-pc"
|
||||
sudo chroot ${chrootpath} apt-get --yes --force-yes install grub-pc
|
||||
}
|
||||
|
||||
conf_install_kernel() {
|
||||
fn conf_install_kernel $@
|
||||
chrootpath="$1"
|
||||
req=(arch chrootpath)
|
||||
ckreq || return 1
|
||||
|
||||
local kernel_base=linux-image
|
||||
local kernel=""
|
||||
|
||||
case $arch in
|
||||
amd64)
|
||||
kernel=${kernel_base}-amd64
|
||||
;;
|
||||
i386)
|
||||
kernel=${kernel_base}-586
|
||||
;;
|
||||
*)
|
||||
error "Architecture ::1 arch:: is not supported!!!" ${arch}
|
||||
zerr; zshexit
|
||||
;;
|
||||
esac
|
||||
|
||||
notice "Installing stock kernel for ::1 arch:: (::2 kernel::)" $arch $kernel
|
||||
sudo chroot ${chrootpath} apt-get --yes --force-yes install $kernel
|
||||
}
|
||||
## base system configurations
|
||||
|
||||
conf_print_debconf() {
|
||||
fn conf_print_debconf
|
||||
|
|
|
|||
Loading…
Reference in New Issue