From b7388a20d6fe0687398bfca007dc4cd8d8f12ef1 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:34:30 +0300 Subject: [PATCH] --- Makefile | 2 -- booster-nvidia.yml | 4 ---- debian/booster.install | 2 ++ debian/{postinst => booster.postinst} | 2 +- debian/{preinst => booster.preinst} | 0 debian/booster.prerm | 5 +++++ debian/changelog | 2 +- debian/control | 7 ++++++- main.sh | 1 - 9 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 booster-nvidia.yml create mode 100644 debian/booster.install rename debian/{postinst => booster.postinst} (94%) rename debian/{preinst => booster.preinst} (100%) create mode 100644 debian/booster.prerm diff --git a/Makefile b/Makefile index 4389d47..877ef8f 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,8 @@ install: ronn docs/manpage.md mkdir "$(DESTDIR)/etc/" touch "$(DESTDIR)/etc/booster.yaml" - touch "$(DESTDIR)/etc/booster-nvidia.yaml" install -Dp -m755 ./generator/generator "$(DESTDIR)/usr/bin/booster" install -Dp -m644 ./docs/manpage.1 "$(DESTDIR)/usr/share/man/man1/booster.1" install -Dp -m755 ./init/init "$(DESTDIR)/usr/lib/booster/init" install -Dp -m755 ./update-initramfs "$(DESTDIR)/usr/lib/booster/update-initramfs" install -Dp -m755 ./booster.yml "$(DESTDIR)/etc/booster.yaml" - install -Dp -m755 ./booster-nvidia.yml "$(DESTDIR)/etc/booster-nvidia.yaml" diff --git a/booster-nvidia.yml b/booster-nvidia.yml deleted file mode 100644 index 5d9c4f1..0000000 --- a/booster-nvidia.yml +++ /dev/null @@ -1,4 +0,0 @@ -vconsole: true -extra_files: busybox -enable_lvm: true -modules_force_load: nvidia,usbhid diff --git a/debian/booster.install b/debian/booster.install new file mode 100644 index 0000000..a75e237 --- /dev/null +++ b/debian/booster.install @@ -0,0 +1,2 @@ +etc +usr diff --git a/debian/postinst b/debian/booster.postinst similarity index 94% rename from debian/postinst rename to debian/booster.postinst index 64471c6..38c1ef5 100644 --- a/debian/postinst +++ b/debian/booster.postinst @@ -28,7 +28,7 @@ fi # Add nvidia support if an nvidia card is detected if lspci -k | grep -iEA3 '^[[:alnum:]]{2}:[[:alnum:]]{2}.*VGA|3D|DISPLAY' | grep -i nvidia && lspci -k | grep -iEA3 '^[[:alnum:]]{2}:[[:alnum:]]{2}.*VGA|3D|DISPLAY' | grep -i -E 'kernel modules|kernel driver' | grep -i nvidia then - cp -f /etc/booster-nvidia.yaml /etc/booster.yaml + sed -i "s#root=#rd.modules_force_load=nvidia,usbhid root=#" /boot/refind_linux.conf fi cp -f /usr/lib/booster/update-initramfs /usr/sbin/update-initramfs diff --git a/debian/preinst b/debian/booster.preinst similarity index 100% rename from debian/preinst rename to debian/booster.preinst diff --git a/debian/booster.prerm b/debian/booster.prerm new file mode 100644 index 0000000..9b829f6 --- /dev/null +++ b/debian/booster.prerm @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +cp -f /usr/sbin/update-initramfs-legacy /usr/sbin/update-initramfs diff --git a/debian/changelog b/debian/changelog index 5609505..8929cf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -booster (0.11.0-99pika21) lunar; urgency=medium +booster (0.11.0-99pika22) lunar; urgency=medium * Do the config properly diff --git a/debian/control b/debian/control index 2cccf44..339195b 100644 --- a/debian/control +++ b/debian/control @@ -10,5 +10,10 @@ Rules-Requires-Root: no Package: booster Architecture: linux-any Depends: ${misc:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox -Provides: booster Description: booster initramfs generation + +Package: booster-placeholder +Architecture: linux-any +Depends: ${misc:Depends}, libdevmapper-dev, libdevmapper-event1.02.1, libdevmapper1.02.1, busybox +Provides: booster (= ${binary:Version}) +Description: PLACEHOLDER FOR ISO BUILDS DO NOT USE. diff --git a/main.sh b/main.sh index 9bb5fef..1f3443b 100755 --- a/main.sh +++ b/main.sh @@ -8,7 +8,6 @@ cd booster cp -rvf ../debian ./ cp -f ../Makefile ./Makefile cp -f ../booster.yml ./booster.yml -cp -f ../booster-nvidia.yml ./booster-nvidia.yml cp -f ../update-initramfs ./update-initramfs # Get build deps