diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 505604f..2979c48 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,6 @@ jobs: append_body: true body_path: ./version-info files: | - ./anotterkiosk-* + ./n-anotterkiosk-* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index b5b5940..1281f9d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This project aims to solve a lot of those (at least for the author), it might al #### Key features -- [Images built via CI](https://github.com/Manawyrm/AnotterKiosk/blob/main/.github/workflows/main.yml) +- [Images built via CI](https://github.com/Manawyrm/N-AnotterKiosk/blob/main/.github/workflows/main.yml) - WiFi connection support - Raspberry Pi (Arm64) compatibility - PC (x86) compatibility @@ -49,13 +49,13 @@ This project aims to solve a lot of those (at least for the author), it might al ### How-To Use -Like any other Raspberry Pi image: download the current .img file from the [Releases](https://github.com/Manawyrm/AnotterKiosk/releases) page and flash it to a storage device of your choice. +Like any other Raspberry Pi image: download the current .img file from the [Releases](https://github.com/Manawyrm/N-AnotterKiosk/releases) page and flash it to a storage device of your choice. SD cards, USB flash drives, USB SSDs, SATA SSDs, NVMe SSDs are all good options. You can use a tool like the [Raspberry Pi Imager](https://www.raspberrypi.com/software/), [BalenaEtcher](https://etcher.balena.io/), [Win32DiskImager](https://sourceforge.net/projects/win32diskimager/) or plain "dd" on \*nix-like systems. When using the latter two, make sure to extract the .gz compression first (using a tool like 7zip). After flashing, re-plug the storage device and open the FAT32 partition. -Open the [`kioskbrowser.ini`](https://github.com/Manawyrm/AnotterKiosk/blob/main/kiosk_skeleton/boot/kioskbrowser.ini) file in a text editor and change everything to your needs. +Open the [`kioskbrowser.ini`](https://github.com/Manawyrm/N-AnotterKiosk/blob/main/kiosk_skeleton/boot/kioskbrowser.ini) file in a text editor and change everything to your needs. More complex WiFi setups (like WPA2-Enterprise) can be configured by creating a wpa_supplicant.conf. Adding your own SSH keys can be done by creating a authorized_keys file. If you want to use the autossh tunneling features, copy an SSH private key as either "id_rsa" or "id_ed25519". diff --git a/build_raspberry_pi.sh b/build_raspberry_pi.sh index 03a92d9..5b04aae 100755 --- a/build_raspberry_pi.sh +++ b/build_raspberry_pi.sh @@ -51,7 +51,7 @@ sed -i 's/vfat defaults/vfat ro,defaults/g' "${BUILD_DIR}/etc/fstab" sed -i 's/ext4 defaults/ext4 ro,defaults/g' "${BUILD_DIR}/etc/fstab" # Include git repo version info -echo -n "AnotterKiosk Raspberry Pi version: " > "${BUILD_DIR}/version-info" +echo -n "N-AnotterKiosk Raspberry Pi version: " > "${BUILD_DIR}/version-info" git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info" # Mount system partitions (from the build host) @@ -84,5 +84,5 @@ sudo umount "${BUILD_DIR}" sudo losetup -D /dev/loop0 tag=$(git describe --abbrev=4 --dirty --always --tags) -mv raspikiosk.img anotterkiosk-${tag}-arm64-raspberrypi.img -pigz -4 anotterkiosk-${tag}-arm64-raspberrypi.img \ No newline at end of file +mv raspikiosk.img n-anotterkiosk-${tag}-arm64-raspberrypi.img +pigz -4 n-anotterkiosk-${tag}-arm64-raspberrypi.img \ No newline at end of file diff --git a/build_x86.sh b/build_x86.sh index c1ef416..6efa1f6 100755 --- a/build_x86.sh +++ b/build_x86.sh @@ -56,7 +56,7 @@ echo "UUID=${fat_uuid} /boot vfat rw,defaults 0 2" echo "UUID=${ext_uuid} / ext4 rw,defaults,noatime 0 1" | sudo tee -a "${BUILD_DIR}/etc/fstab" # Include git repo version info -echo -n "AnotterKiosk x86 version: " > "${BUILD_DIR}/version-info" +echo -n "N-AnotterKiosk x86 version: " > "${BUILD_DIR}/version-info" git describe --abbrev=4 --dirty --always --tags >> "${BUILD_DIR}/version-info" # Mount system partitions (from the build host) @@ -86,5 +86,5 @@ sudo umount "${BUILD_DIR}" sudo losetup -D "${ld}" tag=$(git describe --abbrev=4 --dirty --always --tags) -mv x86kiosk.img anotterkiosk-${tag}-x86.img -pigz -4 anotterkiosk-${tag}-x86.img \ No newline at end of file +mv x86kiosk.img n-anotterkiosk-${tag}-x86.img +pigz -4 n-anotterkiosk-${tag}-x86.img \ No newline at end of file diff --git a/kiosk_skeleton/etc/hyperion/hyperion.config.json b/kiosk_skeleton/etc/hyperion/hyperion.config.json index 30d2a66..090c37f 100644 --- a/kiosk_skeleton/etc/hyperion/hyperion.config.json +++ b/kiosk_skeleton/etc/hyperion/hyperion.config.json @@ -1,6 +1,6 @@ { "general": { - "name": "AnotterKiosk" + "name": "N-AnotterKiosk" }, "grabber": { "type": "framebuffer", diff --git a/kiosk_skeleton/etc/issue b/kiosk_skeleton/etc/issue index 7889400..5cf6b2e 100644 --- a/kiosk_skeleton/etc/issue +++ b/kiosk_skeleton/etc/issue @@ -1,2 +1,2 @@ -AnotterKiosk \n \l +N-AnotterKiosk \n \l diff --git a/kiosk_skeleton/etc/motd b/kiosk_skeleton/etc/motd index 048b279..e37aa6f 100644 --- a/kiosk_skeleton/etc/motd +++ b/kiosk_skeleton/etc/motd @@ -1,4 +1,3 @@ -Welcome to AnotterKiosk! -Run "mount -o remount,rw /" to make the root filesystem writeable. +Welcome to N-AnotterKiosk! FAT32 / config partition is located in /boot. diff --git a/x86_skeleton/etc/default/grub.d/anotterkiosk.cfg b/x86_skeleton/etc/default/grub.d/anotterkiosk.cfg deleted file mode 100644 index a0dca6b..0000000 --- a/x86_skeleton/etc/default/grub.d/anotterkiosk.cfg +++ /dev/null @@ -1 +0,0 @@ -GRUB_DISTRIBUTOR="AnotterKiosk" \ No newline at end of file diff --git a/x86_skeleton/etc/default/grub.d/n-anotterkiosk.cfg b/x86_skeleton/etc/default/grub.d/n-anotterkiosk.cfg new file mode 100644 index 0000000..a3caba7 --- /dev/null +++ b/x86_skeleton/etc/default/grub.d/n-anotterkiosk.cfg @@ -0,0 +1 @@ +GRUB_DISTRIBUTOR="N-AnotterKiosk" \ No newline at end of file diff --git a/x86_skeleton/setup.sh b/x86_skeleton/setup.sh index 233889b..843b8a1 100755 --- a/x86_skeleton/setup.sh +++ b/x86_skeleton/setup.sh @@ -13,7 +13,7 @@ apt install -y firmware-amd-graphics firmware-iwlwifi firmware-brcm80211 firmwar echo "grub-efi-amd64 grub2/force_efi_extra_removable boolean true" | debconf-set-selections update-grub -grub-install --target=x86_64-efi --efi-directory=/boot --removable --bootloader-id=AnotterKiosk +grub-install --target=x86_64-efi --efi-directory=/boot --removable --bootloader-id=N-AnotterKiosk useradd -U -m -s /bin/bash -u 1000 -G audio,video,users,input,adm,dialout,plugdev,render pi