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

customise: whitespace cleanup

This commit is contained in:
Jaromil 2016-06-13 16:43:52 +02:00
parent db8d68391a
commit 467a85c70c
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zlibs/customise
View File

@ -21,7 +21,7 @@
# You should have received a copy of the GNU General Public License # 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/>. # along with this source code. If not, see <http://www.gnu.org/licenses/>.
### customise ### customise
kernel_x86_install_default(){ kernel_x86_install_default(){
fn kernel_x86_install_default $@ fn kernel_x86_install_default $@
@ -32,7 +32,7 @@ kernel_x86_install_default(){
local kernel_base=linux-image local kernel_base=linux-image
local kernel="" local kernel=""
case $arch in case $arch in
amd64) amd64)
kernel=${kernel_base}-amd64 kernel=${kernel_base}-amd64
@ -45,13 +45,13 @@ kernel_x86_install_default(){
zerr; zshexit zerr; zshexit
;; ;;
esac esac
notice "Installing stock kernel for ::1 arch:: (::2 kernel::)" $arch $kernel notice "Installing stock kernel for ::1 arch:: (::2 kernel::)" $arch $kernel
mountdevprocsys ${root} mountdevprocsys ${root}
sudo chroot ${root} apt-get --yes --force-yes --no-install-recommends install $kernel sudo chroot ${root} apt-get --yes --force-yes --no-install-recommends install $kernel
umountdevprocsys ${root} umountdevprocsys ${root}
notice "default kernel installed" notice "default kernel installed"
} }
@ -66,7 +66,7 @@ grub_install_target_dev(){
# TODO: should we use qemu-chroot here for $arch = arm (parazyd?) # TODO: should we use qemu-chroot here for $arch = arm (parazyd?)
sudo chroot ${root} apt-get install --assume-yes --no-install-recommends grub-common sudo chroot ${root} apt-get install --assume-yes --no-install-recommends grub-common
if [[ ! -d ${root}/boot/grub ]]; then if [[ ! -d ${root}/boot/grub ]]; then
sudo mkdir ${root}/boot/grub sudo mkdir ${root}/boot/grub
fi fi
@ -80,10 +80,10 @@ EOF
sudo cp ${devicemap} ${root}/boot/grub/device.map sudo cp ${devicemap} ${root}/boot/grub/device.map
sudo chroot ${root} grub-mkconfig -o /boot/grub/grub.cfg sudo chroot ${root} grub-mkconfig -o /boot/grub/grub.cfg
## we now tamper with grub.cfg, to remove all references to ## we now tamper with grub.cfg, to remove all references to
## loopback devices... ## loopback devices...
## FIXME!!! This is a hack... ## FIXME!!! This is a hack...
sudo -- sed -r -i -e 's/.*loop.*//g' ${root}/boot/grub/grub.cfg sudo -- sed -r -i -e 's/.*loop.*//g' ${root}/boot/grub/grub.cfg
sudo grub-install --root-directory=${root} --no-floppy \ sudo grub-install --root-directory=${root} --no-floppy \
--modules="ext2 part_msdos" ${install_dev} --modules="ext2 part_msdos" ${install_dev}
} }
@ -99,12 +99,12 @@ qemu_make_img(){
root=$strapdir root=$strapdir
freq=($root/.done) freq=($root/.done)
reqck || return 1 reqck || return 1
local blockskip=2050 local blockskip=2050
## create the qemu image ## create the qemu image
notice "Creating qemu image: $imgfile" notice "Creating qemu image: $imgfile"
qemu-img create -f ${imgformat} ${imgfile} ${imgsize} qemu-img create -f ${imgformat} ${imgfile} ${imgsize}
[[ $? = 0 ]] || { [[ $? = 0 ]] || {
error "failed: qemu-img create -f ${imgformat} ${imgfile} ${imgsize}" error "failed: qemu-img create -f ${imgformat} ${imgfile} ${imgsize}"
@ -130,7 +130,7 @@ qemu_make_img(){
sudo losetup -d ${loop1} sudo losetup -d ${loop1}
error "failed: losetup -o $((${blockskip} * 512)) ${loop2} ${loop1}" error "failed: losetup -o $((${blockskip} * 512)) ${loop2} ${loop1}"
zsherr; zshexit } zsherr; zshexit }
## now we create the fs ## now we create the fs
act "creating filesystem" act "creating filesystem"
sudo mkfs.ext4 ${loop2} sudo mkfs.ext4 ${loop2}
@ -140,8 +140,8 @@ qemu_make_img(){
error "failed: mkfs.ext4 $loop2" error "failed: mkfs.ext4 $loop2"
zsherr; zshexit } zsherr; zshexit }
## and we loop-mount it ## and we loop-mount it
ztmpd ztmpd
mntdir=$ztmpdir mntdir=$ztmpdir
sudo mount -o loop ${loop2} ${mntdir} sudo mount -o loop ${loop2} ${mntdir}
@ -150,11 +150,11 @@ qemu_make_img(){
sudo losetup -d ${loop1} sudo losetup -d ${loop1}
error "failed: mount -o loop ${loop2} ${mntdir}" error "failed: mount -o loop ${loop2} ${mntdir}"
zsherr; zshexit } zsherr; zshexit }
func "mntdir: $mntdir" func "mntdir: $mntdir"
func "strapdir: $strapdir" func "strapdir: $strapdir"
# now we rsync everything # now we rsync everything
sudo rsync -raX ${strapdir}/ ${mntdir} sudo rsync -raX ${strapdir}/ ${mntdir}
[[ $? = 0 ]] || { [[ $? = 0 ]] || {
umount $mntdir umount $mntdir
@ -162,12 +162,12 @@ qemu_make_img(){
sudo losetup -d ${loop1} sudo losetup -d ${loop1}
error "failed: rsync -raX ${strapdir}/ ${mntdir}" error "failed: rsync -raX ${strapdir}/ ${mntdir}"
zsherr; zshexit } zsherr; zshexit }
# we now install the grub bootloader # we now install the grub bootloader
mountdevprocsys ${mntdir} mountdevprocsys ${mntdir}
grub_install_target_dev ${mntdir} ${loop1} grub_install_target_dev ${mntdir} ${loop1}
umountdevprocsys ${mntdir} umountdevprocsys ${mntdir}
sync sync
sudo umount ${mntdir} sudo umount ${mntdir}