summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Luka Šijanec <anton@sijanec.eu>2023-07-25 19:48:00 +0200
committerAnton Luka Šijanec <anton@sijanec.eu>2023-07-25 19:48:00 +0200
commit5d297731865ab6e4df01fa3eb07c86adb6b3aba7 (patch)
treea3a638354d039465815a3a78526e73711009b59e
parentMerge branch 'master' of ssh://ni/var/lib/git/sijanec/n (diff)
downloadn-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar.gz
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar.bz2
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar.lz
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar.xz
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.tar.zst
n-5d297731865ab6e4df01fa3eb07c86adb6b3aba7.zip
-rw-r--r--etc/dracut.conf.d/anton.conf2
-rwxr-xr-xroot/linux/dist.sh3
-rwxr-xr-xroot/linux/upgrade.sh3
3 files changed, 3 insertions, 5 deletions
diff --git a/etc/dracut.conf.d/anton.conf b/etc/dracut.conf.d/anton.conf
index 1cd033b..df63fcd 100644
--- a/etc/dracut.conf.d/anton.conf
+++ b/etc/dracut.conf.d/anton.conf
@@ -1 +1 @@
-install_items="/lib/firmware/regulatory.db /lib/firmware/regulatory.db.p7s /lib/firmware/i915/tgl_dmc_ver2_12.bin /lib/firmware/intel/ibt-19-0-4.sfi /lib/firmware/intel/ibt-19-0-4.ddc /lib/firmware/iwlwifi-QuZ-a0-hr-b0-72.ucode /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw"
+install_items+=" /lib/firmware/regulatory.db /lib/firmware/regulatory.db.p7s /lib/firmware/i915/tgl_dmc_ver2_12.bin /lib/firmware/intel/ibt-19-0-4.sfi /lib/firmware/intel/ibt-19-0-4.ddc /lib/firmware/iwlwifi-QuZ-a0-hr-b0-72.ucode /lib/firmware/ath9k_htc/htc_9271-1.4.0.fw "
diff --git a/root/linux/dist.sh b/root/linux/dist.sh
index e4d3b23..6538073 100755
--- a/root/linux/dist.sh
+++ b/root/linux/dist.sh
@@ -5,8 +5,7 @@ m=`cut -d- -f2- <<<$k`
p=`rev <<<$0 | cut -d/ -f1 | rev`
d=`mktemp -d -p "" $p.XXX`
pushd $d
-dracut $m
-mv $m /boot/initramfs-$m.img
+dracut --force --kver $m /boot/initramfs-$m.img
grub-mkconfig -o /boot/grub/grub.cfg
popd
rm -fr $d
diff --git a/root/linux/upgrade.sh b/root/linux/upgrade.sh
index 84a5354..ee6a474 100755
--- a/root/linux/upgrade.sh
+++ b/root/linux/upgrade.sh
@@ -11,6 +11,5 @@ make modules
make install
make modules_install
m=`cut -d- -f2- <<<$k`
-dracut $m
-mv $m /boot/initramfs-$m.img
+dracut --force --kver $m /boot/initramfs-$m.img
grub-mkconfig > /boot/grub/grub.cfg