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:12:58 +02:00
parent 6fe1b1d9e4
commit 1908139dfd
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch-install
View file

@ -799,11 +799,11 @@ 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" " -f2)" kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f1)"
linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f1)"
kernel="${kernel1#/*/}" kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}" linuz="${linuz1#/*/}"
kernelback1="$(echo $(find /boot/ -name "initramfs*$(uname -m)-fallback.img") | cut -d" " -f2)" kernelback1="$(echo $(find /boot/ -name "initramfs*-fallback.img") | cut -d" " -f1)"
kernelback="${kernelback1#/*/}" kernelback="${kernelback1#/*/}"
else else
kernel="initramfs-linux.img" kernel="initramfs-linux.img"

4
make_mksquashfs-auto.sh
View file

@ -211,8 +211,8 @@ 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 ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*.img") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp "$(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*.img") | cut -d" " -f1)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
cp "$(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz-linux*") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz cp "$(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*") | cut -d" " -f1)" ${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/
cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/

10
snapshot.sh
View file

@ -44,13 +44,11 @@ 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" " -f2)" /boot/initramfs-linux-1.00-$(uname -m).img cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f1)" /boot/initramfs-stable.img
cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" /boot/vmlinuz-1.00-$(uname -m) cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f1)" /boot/vmlinuz-stable
kernel1="$(echo $(find /boot/ -name "initramfs*-1.00.img") | cut -d" " -f2)" kernel="/initramfs-stable.img"
linuz1="$(find /boot/ -name "vmlinuz*-1.00-$(uname -m)")" linuz="/vmlinuz-stable"
kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}"
sed "s|%LINUZ%|${linuz}|g;s|%KERNEL%|${kernel}|g;s|rootflags=subvol=__current/ROOT|rootflags=subvol=__snapshot/ROOT@`head -n 1 /run/btrfs-root/__current/ROOT/SNAPSHOT`|g" /boot/arch-uefi.conf.example > /boot/loader/entries/arch-uefi-stable.conf sed "s|%LINUZ%|${linuz}|g;s|%KERNEL%|${kernel}|g;s|rootflags=subvol=__current/ROOT|rootflags=subvol=__snapshot/ROOT@`head -n 1 /run/btrfs-root/__current/ROOT/SNAPSHOT`|g" /boot/arch-uefi.conf.example > /boot/loader/entries/arch-uefi-stable.conf

6
update-bootloader
View file

@ -10,12 +10,12 @@ fi
echo "Als root Angemeldet" echo "Als root Angemeldet"
kernel1="$(echo $(find /boot/ -name "initramfs*$(uname -m).img") | cut -d" " -f2)" kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f1)"
linuz1="$(echo $(find /boot/ -name "vmlinuz*$(uname -m)") | cut -d" " -f2)" linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f1)"
kernel="${kernel1#/*/}" kernel="${kernel1#/*/}"
linuz="${linuz1#/*/}" linuz="${linuz1#/*/}"
kernelback1="$(echo $(find /boot/ -name "initramfs*$(uname -m)-fallback.img") | cut -d" " -f2)" kernelback1="$(echo $(find /boot/ -name "initramfs*-fallback.img") | cut -d" " -f1)"
kernelback="${kernelback1#/*/}" kernelback="${kernelback1#/*/}"