simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-04-25 09:28:05 +02:00
parent 51f8cb427d
commit d7fa1dee93
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
make_mksquashfs-auto.sh
View file

@ -26,12 +26,13 @@ for wort in "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"
do do
echo "$wort" echo "$wort"
if [ "$wort" == "deletework" ]; then deletework=y; fi if [ "$wort" == "deletework" ]; then deletework=y; fi
if [ "$wort" == "makesystem" ]; then makesystem=y; fi
if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi
if [ "$wort" == "filesystem" ]; then filesystem=y; fi if [ "$wort" == "filesystem" ]; then filesystem=y; fi
if [ "$wort" == "archchroot" ]; then archchroot=y; fi if [ "$wort" == "archchroot" ]; then archchroot=y; fi
if [ "$wort" == "makebios" ]; then makebios=y; fi
if [ "$wort" == "makeimage" ]; then makeimage=y; fi if [ "$wort" == "makeimage" ]; then makeimage=y; fi
if [ "$wort" == "makebios" ]; then makebios=y; fi
if [ "$wort" == "makeiso" ]; then makeiso=y; fi if [ "$wort" == "makeiso" ]; then makeiso=y; fi
if [ "$wort" == "mkinitcpio" ]; then mkinitcpio=y; fi
done done
sleep 5 sleep 5
@ -108,14 +109,26 @@ function system() {
rm -Rv ${work_dir} rm -Rv ${work_dir}
fi fi
fi fi
mkdir -p ${work_dir}/${arch}/airootfs if [ "${makesystem}" == "y" ]; then
minimalinstallation mkdir -p ${work_dir}/${arch}/airootfs
minimalinstallation
fi
fi fi
fi fi
if [ "${mkinitcpio}" == "y" ]; then if [ "${mkinitcpio}" == "y" ]; then
# module and hooks # module and hooks
# hooks
cp -v install/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
cp -v hooks/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
cp -v script/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/
cp -v install/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "MODULES=\"i915 radeon nouveau ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
echo "HOOKS=\"base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf echo "HOOKS=\"base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
@ -138,16 +151,6 @@ function system() {
./arch-chroot ${work_dir}/${arch}/airootfs mkinitcpio -p linux ./arch-chroot ${work_dir}/${arch}/airootfs mkinitcpio -p linux
fi fi
# hooks
cp -v install/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
cp -v hooks/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
cp -v script/archiso* ${work_dir}/${arch}/airootfs/usr/lib/initcpio/
cp -v install/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/install/
cp -v hooks/cow_device ${work_dir}/${arch}/airootfs/usr/lib/initcpio/hooks/
fi fi
fi fi