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

Merge branch 'master' of ssh://5.83.162.84:22/home/git/SpectreOS

Browse source
This commit is contained in:
simono41 2018-08-21 23:39:54 +02:00
commit e9a82546ca
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make_mksquashfs-auto.sh
View file

@ -212,7 +212,7 @@ function BIOS() {
if [ "${version}" == "manjaro" ]; then if [ "${version}" == "manjaro" ]; then
cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*$(uname -m).img") | cut -d" " -f2 ) ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*$(uname -m).img") | cut -d" " -f2 ) ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*$(uname -m)") | cut -d" " -f1 ) ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*$(uname -m)") | cut -d" " -f2 ) ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
else else
cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux${linuxparameter}.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux${linuxparameter}.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux${linuxparameter} ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux${linuxparameter} ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz

2
snapshot.sh
View file

@ -52,7 +52,7 @@ if [ "make" == "$1" ] || [ "makeboot" == "y" ]; then
if [ -f "/boot/arch-uefi.conf.example" ] && [ "${rootsnapshot}" == "y" ]; then if [ -f "/boot/arch-uefi.conf.example" ] && [ "${rootsnapshot}" == "y" ]; then
cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)" /boot/initramfs-linux-stable.img cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)" /boot/initramfs-linux-stable.img
cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f1)" /boot/vmlinuz-stable cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" /boot/vmlinuz-stable
kernel1="$(echo $(find /boot/ -name "initramfs*-stable.img") | cut -d" " -f2)" kernel1="$(echo $(find /boot/ -name "initramfs*-stable.img") | cut -d" " -f2)"
linuz1="$(find /boot/ -name "vmlinuz*-stable")" linuz1="$(find /boot/ -name "vmlinuz*-stable")"

2
update-bootloader
View file

@ -4,7 +4,7 @@ set -ex
kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)" kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)"
linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f1)" linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)"
kernel="${kernel1#/*/}" kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}" linuz="${linuz1#/*/}"