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

Fixup beowulf desktop blend.

This commit is contained in:
parazyd 2020-11-13 17:13:34 +01:00
parent 20b8a42a23
commit a1ff78680b
No known key found for this signature in database
GPG Key ID: 6B636BF0493EE747
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
blends/devuan-desktop-live/devuan-desktop-live.blend
View File

@ -35,23 +35,23 @@ blend_preinst() {
cat <<EOF | sudo tee "$strapdir/add-user" >/dev/null cat <<EOF | sudo tee "$strapdir/add-user" >/dev/null
#!/bin/sh #!/bin/sh
useradd -s /bin/bash -m "${username}" || exit 1 useradd -s /bin/bash -m "${username}" || exit 1
echo "${username}:${userpass} | chpasswd || exit 1 echo "${username}:${userpass}" | chpasswd || exit 1
EOF EOF
chroot-script -d add-user || { zerr; return 1; } chroot-script -d add-user || { zerr; return 1; }
notice "copying blend-specific debs into $R/extra/custom-packages" # notice "copying blend-specific debs into $R/extra/custom-packages"
#
sudo mkdir -p "$strapdir/extra_packages" || { zerr; return 1; } # sudo mkdir -p "$strapdir/extra_packages" || { zerr; return 1; }
sudo cp -fv "$blend_release_path"/custom_debs/*.deb "$strapdir/extra_packages" || { zerr; return 1; } # sudo cp -fv "$blend_release_path"/custom_debs/*.deb "$strapdir/extra_packages" || { zerr; return 1; }
cat << EOF # cat << EOF
#!/bin/sh ##!/bin/sh
cd custom-packages #cd custom-packages
dpkg -i *_all.deb *_${arch}.deb #dpkg -i *_all.deb *_${arch}.deb
apt-get -f install #apt-get -f install
cd - >/dev/null #cd - >/dev/null
rm -rf custom-packages #rm -rf custom-packages
EOF #EOF
chroot-script -d install-custpackages || { zerr; return 1; } # chroot-script -d install-custpackages || { zerr; return 1; }
} }
blend_postinst() { blend_postinst() {
@ -174,7 +174,7 @@ EOF
sudo cp -rav "$blend_release_path"/isolinux-overlay/* "$workdir"/binary/isolinux/ sudo cp -rav "$blend_release_path"/isolinux-overlay/* "$workdir"/binary/isolinux/
sudo cp -av "$blend_release_path"/live-overlay/* "$workdir"/binary/live/ sudo cp -av "$blend_release_path"/live-overlay/* "$workdir"/binary/live/
sudo cp -av "$blend_release_path"/docs "$workdir"/binary/ sudo cp -av "$blend_release_path"/docs "$workdir"/binary/
edit_initramfs #edit_initramfs
# [[ -n "$hookscripts" ]] && { # [[ -n "$hookscripts" ]] && {
# sudo cp -av "$blend_release_path"/hooks "$workdir"/binary/live/ # sudo cp -av "$blend_release_path"/hooks "$workdir"/binary/live/
# } # }
@ -185,7 +185,7 @@ EOF
# from similar scripts by Colin Watson and Patrick J. Volkerding. # from similar scripts by Colin Watson and Patrick J. Volkerding.
iso_make_efi() { iso_make_efi() {
fn iso_make_efi fn iso_make_efi
req=(workdir efi_work) req=(workdir efi_work strapdir)
ckreq || return 1 ckreq || return 1
notice "creating efi boot files" notice "creating efi boot files"
@ -270,7 +270,7 @@ EOF
sudo cp "$tempdir"/bootia32.efi img-mnt/efi/boot/ sudo cp "$tempdir"/bootia32.efi img-mnt/efi/boot/
# copy modules and font # copy modules and font
cp $strapdir/usr/lib/grub/${grubarch}/* boot/grub/${grubarch}/ cp -r "$strapdir/usr/lib/grub/${grubarch}"/* "boot/grub/${grubarch}/"
# if this doesn't work try another font from the same place (grub's default, unicode.pf2, is much larger) # if this doesn't work try another font from the same place (grub's default, unicode.pf2, is much larger)
# Either of these will work, and they look the same to me. Unicode seems to work with qemu. -fsr # Either of these will work, and they look the same to me. Unicode seems to work with qemu. -fsr