mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
fixes
This commit is contained in:
parent
2aeb0bde72
commit
a6aeab7ac9
9 changed files with 66 additions and 63 deletions
|
|
@ -1,8 +1,8 @@
|
|||
xorriso/input.txt: xorriso/gen_input.sh
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
|
||||
$(eval _VARS = FLATPAK_DIR IMAGE_NAME IMAGE_TAG ARCH VERSION)
|
||||
$(foreach var,$(_VARS),$(var)=$($(var))) bash $(_BASE_DIR)/xorriso/gen_input.sh | tee $(_BASE_DIR)/xorriso/input.txt
|
||||
input.txt: gen_input.sh
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' ../results/boot/grub2/grub.cfg
|
||||
sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' ../results/EFI/BOOT/grub.cfg
|
||||
$(eval _VARS = ARCH _BASE_DIR FLATPAK_DIR IMAGE_NAME IMAGE_TAG ISO_NAME VERSION)
|
||||
$(foreach var,$(_VARS),$(var)=$($(var))) bash gen_input.sh | tee input.txt
|
||||
|
||||
install-deps:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,22 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo "-report_about WARNING"
|
||||
echo "-indev $(pwd)/boot.iso"
|
||||
echo "-outdev $(pwd)/build/deploy.iso"
|
||||
echo "-indev ${_BASE_DIR}/results/images/boot.iso"
|
||||
echo "-outdev ${ISO_NAME}"
|
||||
echo "-boot_image any replay"
|
||||
echo "-joliet on"
|
||||
echo "-compliance joliet_long_names"
|
||||
echo "-map $(pwd)/results/boot/grub2/grub.cfg boot/grub2/grub.cfg"
|
||||
echo "-chmod 0444 boot/grub2/grub.cfg"
|
||||
echo "-map $(pwd)/results/EFI/BOOT/grub.cfg EFI/BOOT/grub.cfg"
|
||||
echo "-chmod 0444 EFI/BOOT/grub.cfg"
|
||||
pushd ${_BASE_DIR}/results > /dev/null
|
||||
for file in $(find *)
|
||||
do
|
||||
if [[ "$file" == "images/boot.iso" ]]
|
||||
then
|
||||
continue
|
||||
fi
|
||||
echo "-map ${_BASE_DIR}/results/${file} ${file}"
|
||||
echo "-chmod 0444 ${file}"
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
if [[ -n "${FLATPAK_DIR}" ]]
|
||||
then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue