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-08-30 00:04:05 +02:00
parent ee744f2040
commit 4244c4cacc
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch-install
View file

@ -799,7 +799,7 @@ function systemdboot() {
#rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}') #rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}')
if [ "${version}" == "manjaro" ]; then if [ "${version}" == "manjaro" ]; then
kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f4)" kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)"
linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)"
kernel="${kernel1#/*/}" kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}" linuz="${linuz1#/*/}"

2
make_mksquashfs-auto.sh
View file

@ -211,7 +211,7 @@ function BIOS() {
cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/ cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/
cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/initramfs*.img") | cut -d" " -f4)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/initramfs*.img") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux*") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux*") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/

2
packages_manjaro.txt
View file

@ -664,8 +664,6 @@ lightdm-gtk-greeter-settings
links links
linux-api-headers linux-api-headers
linux-firmware linux-firmware
linux316
linux316-nvidia
linux414 linux414
linux414-nvidia linux414-nvidia
lirc lirc

2
snapshot.sh
View file

@ -44,7 +44,7 @@ if [ "make" == "$1" ]; then
#stable-snapshot-boot #stable-snapshot-boot
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" " -f4)" /boot/initramfs-linux-1.00-$(uname -m).img cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)" /boot/initramfs-linux-1.00-$(uname -m).img
cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" /boot/vmlinuz-1.00-$(uname -m) cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" /boot/vmlinuz-1.00-$(uname -m)
kernel1="$(echo $(find /boot/ -name "initramfs*-1.00.img") | cut -d" " -f2)" kernel1="$(echo $(find /boot/ -name "initramfs*-1.00.img") | cut -d" " -f2)"