From d116eb3550dc104914bfe163b75cbe716a72ce23 Mon Sep 17 00:00:00 2001 From: ook37 Date: Fri, 3 Jan 2025 09:45:05 -0500 Subject: [PATCH] try submodule --- .github/workflows/iso.yml | 4 ++++ .gitmodules | 3 +++ etc/config/hooks/live/setup-casper-folder.binary | 2 +- etc/config/includes.binary/grub | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 etc/config/includes.binary/grub diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml index 271a1f5..6c5e7e4 100644 --- a/.github/workflows/iso.yml +++ b/.github/workflows/iso.yml @@ -8,6 +8,8 @@ jobs: runs-on: buildjet-4vcpu-ubuntu-2204 steps: - uses: actions/checkout@v4 + with: + submodules: recursive - name: Install needed packages run: | @@ -38,6 +40,8 @@ jobs: runs-on: buildjet-4vcpu-ubuntu-2204-arm steps: - uses: actions/checkout@v4 + with: + submodules: recursive - name: Install needed packages run: | diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..a9a01d1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "etc/config/includes.binary/grub"] + path = etc/config/includes.binary/grub + url = https://github.com/rhino-linux/grub.git diff --git a/etc/config/hooks/live/setup-casper-folder.binary b/etc/config/hooks/live/setup-casper-folder.binary index d691939..3351d45 100755 --- a/etc/config/hooks/live/setup-casper-folder.binary +++ b/etc/config/hooks/live/setup-casper-folder.binary @@ -8,5 +8,5 @@ mv live/vmlinuz-* casper/vmlinuz mv live/filesystem.packages-remove casper/filesystem.manifest-remove mv live/filesystem.packages casper/filesystem.manifest mkdir -p casper/boot/grub/themes -cp -r usr/share/grub/themes/rhino casper/boot/grub/themes/rhino +cp -rf ../config/includes.binary/grub casper/boot/grub/themes/rhino printf "$(sudo du -sx --block-size=1 ./ | cut -f1)" > casper/filesystem.size diff --git a/etc/config/includes.binary/grub b/etc/config/includes.binary/grub new file mode 160000 index 0000000..d27e654 --- /dev/null +++ b/etc/config/includes.binary/grub @@ -0,0 +1 @@ +Subproject commit d27e654c05a73797e449e8a26146cd14bfdaae4c