mirror of
https://github.com/YunoHost/cd_build.git
synced 2024-09-03 20:06:24 +02:00
Bugfix in add-formware-to
This commit is contained in:
parent
e955be1a48
commit
307dbb5ab5
1 changed files with 4 additions and 3 deletions
|
@ -27,6 +27,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
|
BUILd_DIR=$(pwd)
|
||||||
|
|
||||||
is_iso() {
|
is_iso() {
|
||||||
file "$1" | grep -q "ISO 9660"
|
file "$1" | grep -q "ISO 9660"
|
||||||
|
@ -70,7 +71,7 @@ initrd_append_fw() {
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p x/usr/share/graphics/
|
mkdir -p x/usr/share/graphics/
|
||||||
cp /home/yunohost/yunohost/extras/bandeau.png x/usr/share/graphics/logo_debian.png
|
cp $BUILD_DIR/extras/bandeau.png x/usr/share/graphics/logo_debian.png
|
||||||
|
|
||||||
(cd x && find . | cpio -H newc -o) >> initrd
|
(cd x && find . | cpio -H newc -o) >> initrd
|
||||||
cd -
|
cd -
|
||||||
|
@ -137,10 +138,10 @@ if is_iso "$file"; then
|
||||||
arch=`echo "$file" | cut -d"-" -f3`
|
arch=`echo "$file" | cut -d"-" -f3`
|
||||||
if [ $arch = "i386" ];
|
if [ $arch = "i386" ];
|
||||||
then
|
then
|
||||||
cp -f /home/yunohost/yunohost/isolinux/{adgtk.cfg,adtxt.cfg,gtk.cfg,menu.cfg,stdmenu.cfg,txt.cfg} $buildtree/isolinux/
|
cp -f $BUILD_DIR/isolinux/{adgtk.cfg,adtxt.cfg,gtk.cfg,menu.cfg,stdmenu.cfg,txt.cfg} $buildtree/isolinux/
|
||||||
else
|
else
|
||||||
rm $buildtree/isolinux/{adgtk.cfg,adtxt.cfg,gtk.cfg,menu.cfg,stdmenu.cfg,txt.cfg}
|
rm $buildtree/isolinux/{adgtk.cfg,adtxt.cfg,gtk.cfg,menu.cfg,stdmenu.cfg,txt.cfg}
|
||||||
cp -f /home/yunohost/yunohost/isolinux/{amdadgtk.cfg,amdadtxt.cfg,amdgtk.cfg,menu.cfg,stdmenu.cfg,amdtxt.cfg} $buildtree/isolinux/
|
cp -f $BUILD_DIR/isolinux/{amdadgtk.cfg,amdadtxt.cfg,amdgtk.cfg,menu.cfg,stdmenu.cfg,amdtxt.cfg} $buildtree/isolinux/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in $(find "$buildtree" -name "initrd.gz" -o -name "initrd.img"); do
|
for i in $(find "$buildtree" -name "initrd.gz" -o -name "initrd.img"); do
|
||||||
|
|
Loading…
Add table
Reference in a new issue