From 760c66b0fae4228848f2757b3a6ae4e03a5c942f Mon Sep 17 00:00:00 2001 From: Matt Compton Date: Sun, 18 Apr 2021 13:04:28 -0400 Subject: [PATCH] Fixing stuff --- build_iso.sh | 14 ++------------ chrooted.sh | 8 ++++---- {pear => crystal}/airootfs/etc/buildstamp | 0 {pear => crystal}/airootfs/etc/doas.conf | 0 {pear => crystal}/airootfs/etc/mkinitcpio.conf | 0 .../airootfs/etc/mkinitcpio.d/linux.preset | 0 {pear => crystal}/airootfs/etc/packages.x86_64 | 0 {pear => crystal}/airootfs/etc/pacman.conf | 0 {pear => crystal}/airootfs/etc/pacman.d/.keep | 0 {pear => crystal}/airootfs/etc/pacman.d/mirrorlist | 0 {pear => crystal}/airootfs/etc/profile | 0 {pear => crystal}/airootfs/etc/ssh/sshd_config | 0 {pear => crystal}/airootfs/etc/sudoers | 0 {pear => crystal}/airootfs/etc/sysrootpkgs | 0 .../etc/systemd/network/20-ethernet.network | 0 .../cloud-init.target.wants/cloud-config.service | 0 .../cloud-init.target.wants/cloud-final.service | 0 .../cloud-init-local.service | 0 .../cloud-init.target.wants/cloud-init.service | 0 .../etc/systemd/system/etc-pacman.d-gnupg.mount | 0 .../system/getty@tty1.service.d/autologin.conf | 0 .../system/multi-user.target.wants/sshd.service | 0 .../systemd-networkd.service | 0 .../systemd-resolved.service | 0 .../etc-pacman.d-gnupg.mount | 0 .../pacman-init.service | 0 .../systemd-networkd-wait-online.service | 0 .../etc/systemd/system/pacman-init.service | 0 .../sockets.target.wants/systemd-networkd.socket | 0 .../wait-for-only-one-interface.conf | 0 {pear => crystal}/airootfs/root/.profile | 0 {pear => crystal}/airootfs/root/.xinitrc | 0 .../loader/entries/archiso-x86_64-linux.conf | 0 {pear => crystal}/efiboot/loader/loader.conf | 0 crystal/packages.removed | 5 +++++ {pear => crystal}/packages.x86_64 | 6 ------ {pear => crystal}/pacman.conf | 6 +++--- {pear => crystal}/profiledef.sh | 8 ++++---- {pear => crystal}/syslinux/syslinux-linux.cfg | 0 {pear => crystal}/syslinux/syslinux.cfg | 0 40 files changed, 18 insertions(+), 29 deletions(-) rename {pear => crystal}/airootfs/etc/buildstamp (100%) rename {pear => crystal}/airootfs/etc/doas.conf (100%) rename {pear => crystal}/airootfs/etc/mkinitcpio.conf (100%) rename {pear => crystal}/airootfs/etc/mkinitcpio.d/linux.preset (100%) rename {pear => crystal}/airootfs/etc/packages.x86_64 (100%) rename {pear => crystal}/airootfs/etc/pacman.conf (100%) rename {pear => crystal}/airootfs/etc/pacman.d/.keep (100%) rename {pear => crystal}/airootfs/etc/pacman.d/mirrorlist (100%) rename {pear => crystal}/airootfs/etc/profile (100%) rename {pear => crystal}/airootfs/etc/ssh/sshd_config (100%) rename {pear => crystal}/airootfs/etc/sudoers (100%) rename {pear => crystal}/airootfs/etc/sysrootpkgs (100%) rename {pear => crystal}/airootfs/etc/systemd/network/20-ethernet.network (100%) rename {pear => crystal}/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount (100%) rename {pear => crystal}/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf (100%) rename {pear => crystal}/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount (100%) rename {pear => crystal}/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/pacman-init.service (100%) rename {pear => crystal}/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket (100%) rename {pear => crystal}/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf (100%) rename {pear => crystal}/airootfs/root/.profile (100%) rename {pear => crystal}/airootfs/root/.xinitrc (100%) rename {pear => crystal}/efiboot/loader/entries/archiso-x86_64-linux.conf (100%) rename {pear => crystal}/efiboot/loader/loader.conf (100%) create mode 100644 crystal/packages.removed rename {pear => crystal}/packages.x86_64 (88%) rename {pear => crystal}/pacman.conf (97%) rename {pear => crystal}/profiledef.sh (71%) rename {pear => crystal}/syslinux/syslinux-linux.cfg (100%) rename {pear => crystal}/syslinux/syslinux.cfg (100%) diff --git a/build_iso.sh b/build_iso.sh index 3338353..83365d8 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -1,15 +1,5 @@ -rm -fv pearos-live-*.iso +rm -fv crystal-live-*.iso -""" -fallocate -l800M sysroot.img -loopdev=$(sudo losetup -Pf --show sysroot.img) -sudo mkfs.ext4 ${loopdev} -sysrootwork=$(mktemp -d) -sudo mount ${loopdev} $sysrootwork -sudo pacstrap ${sysrootwork} $(cat sysrootpkgs) -sudo umount ${sysrootwork} -mv sysroot.img pear/airootfs/. -""" WORKDIR=$(mktemp -d) # idk if this would've happened automatically? @@ -17,7 +7,7 @@ cp pear/pacman.conf pear/airootfs/etc/. cp pear/packages.x86_64 pear/airootfs/etc/packages.x86_64 cp /etc/pacman.d/mirrorlist pear/airootfs/etc/pacman.d/. echo "Built on $(date +"%D @ %T EST")" > pear/airootfs/etc/buildstamp -time sudo ./mkarchiso -v -w $WORKDIR -o . pear +time sudo ./mkarchiso -v -w $WORKDIR -o . crystal sudo rm -rf $WORKDIR if [[ "$1" == "docker" ]]; then diff --git a/chrooted.sh b/chrooted.sh index 18ebb80..1d00878 100644 --- a/chrooted.sh +++ b/chrooted.sh @@ -2,10 +2,10 @@ # This file is run via mkarchiso while chrooted as the new system echo "We're in the new system. :)" echo "Performing minor tweaks" -sed -i 's/Arch/PearOS/g' /etc/issue -sed -i 's/Arch/PearOS/g' /etc/arch-release -sed -i 's/Arch/PearOS/g' /etc/os-release -echo "PearLive" > /etc/hostname +sed -i 's/Arch/CrystalUX/g' /etc/issue +sed -i 's/Arch/CrystalUX/g' /etc/arch-release +sed -i 's/Arch/CrystalUX/g' /etc/os-release +echo "CrystalLive" > /etc/hostname #reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist echo "sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup chmod +x /usr/bin/mirrorsetup diff --git a/pear/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp similarity index 100% rename from pear/airootfs/etc/buildstamp rename to crystal/airootfs/etc/buildstamp diff --git a/pear/airootfs/etc/doas.conf b/crystal/airootfs/etc/doas.conf similarity index 100% rename from pear/airootfs/etc/doas.conf rename to crystal/airootfs/etc/doas.conf diff --git a/pear/airootfs/etc/mkinitcpio.conf b/crystal/airootfs/etc/mkinitcpio.conf similarity index 100% rename from pear/airootfs/etc/mkinitcpio.conf rename to crystal/airootfs/etc/mkinitcpio.conf diff --git a/pear/airootfs/etc/mkinitcpio.d/linux.preset b/crystal/airootfs/etc/mkinitcpio.d/linux.preset similarity index 100% rename from pear/airootfs/etc/mkinitcpio.d/linux.preset rename to crystal/airootfs/etc/mkinitcpio.d/linux.preset diff --git a/pear/airootfs/etc/packages.x86_64 b/crystal/airootfs/etc/packages.x86_64 similarity index 100% rename from pear/airootfs/etc/packages.x86_64 rename to crystal/airootfs/etc/packages.x86_64 diff --git a/pear/airootfs/etc/pacman.conf b/crystal/airootfs/etc/pacman.conf similarity index 100% rename from pear/airootfs/etc/pacman.conf rename to crystal/airootfs/etc/pacman.conf diff --git a/pear/airootfs/etc/pacman.d/.keep b/crystal/airootfs/etc/pacman.d/.keep similarity index 100% rename from pear/airootfs/etc/pacman.d/.keep rename to crystal/airootfs/etc/pacman.d/.keep diff --git a/pear/airootfs/etc/pacman.d/mirrorlist b/crystal/airootfs/etc/pacman.d/mirrorlist similarity index 100% rename from pear/airootfs/etc/pacman.d/mirrorlist rename to crystal/airootfs/etc/pacman.d/mirrorlist diff --git a/pear/airootfs/etc/profile b/crystal/airootfs/etc/profile similarity index 100% rename from pear/airootfs/etc/profile rename to crystal/airootfs/etc/profile diff --git a/pear/airootfs/etc/ssh/sshd_config b/crystal/airootfs/etc/ssh/sshd_config similarity index 100% rename from pear/airootfs/etc/ssh/sshd_config rename to crystal/airootfs/etc/ssh/sshd_config diff --git a/pear/airootfs/etc/sudoers b/crystal/airootfs/etc/sudoers similarity index 100% rename from pear/airootfs/etc/sudoers rename to crystal/airootfs/etc/sudoers diff --git a/pear/airootfs/etc/sysrootpkgs b/crystal/airootfs/etc/sysrootpkgs similarity index 100% rename from pear/airootfs/etc/sysrootpkgs rename to crystal/airootfs/etc/sysrootpkgs diff --git a/pear/airootfs/etc/systemd/network/20-ethernet.network b/crystal/airootfs/etc/systemd/network/20-ethernet.network similarity index 100% rename from pear/airootfs/etc/systemd/network/20-ethernet.network rename to crystal/airootfs/etc/systemd/network/20-ethernet.network diff --git a/pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service similarity index 100% rename from pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service rename to crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service diff --git a/pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service similarity index 100% rename from pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service rename to crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service diff --git a/pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service similarity index 100% rename from pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service rename to crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service diff --git a/pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service similarity index 100% rename from pear/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service rename to crystal/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service diff --git a/pear/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/crystal/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount similarity index 100% rename from pear/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount rename to crystal/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount diff --git a/pear/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf similarity index 100% rename from pear/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf rename to crystal/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf diff --git a/pear/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/crystal/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service similarity index 100% rename from pear/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service rename to crystal/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service diff --git a/pear/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/crystal/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service similarity index 100% rename from pear/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service rename to crystal/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service diff --git a/pear/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/crystal/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service similarity index 100% rename from pear/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service rename to crystal/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service diff --git a/pear/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount b/crystal/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount similarity index 100% rename from pear/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount rename to crystal/airootfs/etc/systemd/system/network-online.target.wants/etc-pacman.d-gnupg.mount diff --git a/pear/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service b/crystal/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service similarity index 100% rename from pear/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service rename to crystal/airootfs/etc/systemd/system/network-online.target.wants/pacman-init.service diff --git a/pear/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/crystal/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service similarity index 100% rename from pear/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service rename to crystal/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service diff --git a/pear/airootfs/etc/systemd/system/pacman-init.service b/crystal/airootfs/etc/systemd/system/pacman-init.service similarity index 100% rename from pear/airootfs/etc/systemd/system/pacman-init.service rename to crystal/airootfs/etc/systemd/system/pacman-init.service diff --git a/pear/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/crystal/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket similarity index 100% rename from pear/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket rename to crystal/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/pear/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/crystal/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf similarity index 100% rename from pear/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf rename to crystal/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf diff --git a/pear/airootfs/root/.profile b/crystal/airootfs/root/.profile similarity index 100% rename from pear/airootfs/root/.profile rename to crystal/airootfs/root/.profile diff --git a/pear/airootfs/root/.xinitrc b/crystal/airootfs/root/.xinitrc similarity index 100% rename from pear/airootfs/root/.xinitrc rename to crystal/airootfs/root/.xinitrc diff --git a/pear/efiboot/loader/entries/archiso-x86_64-linux.conf b/crystal/efiboot/loader/entries/archiso-x86_64-linux.conf similarity index 100% rename from pear/efiboot/loader/entries/archiso-x86_64-linux.conf rename to crystal/efiboot/loader/entries/archiso-x86_64-linux.conf diff --git a/pear/efiboot/loader/loader.conf b/crystal/efiboot/loader/loader.conf similarity index 100% rename from pear/efiboot/loader/loader.conf rename to crystal/efiboot/loader/loader.conf diff --git a/crystal/packages.removed b/crystal/packages.removed new file mode 100644 index 0000000..9c340c5 --- /dev/null +++ b/crystal/packages.removed @@ -0,0 +1,5 @@ +pear-resources +pear-skel +pear-misc +palamares +pear-qtmares \ No newline at end of file diff --git a/pear/packages.x86_64 b/crystal/packages.x86_64 similarity index 88% rename from pear/packages.x86_64 rename to crystal/packages.x86_64 index b2f8aed..a550173 100644 --- a/pear/packages.x86_64 +++ b/crystal/packages.x86_64 @@ -39,12 +39,6 @@ dolphin tk tree -pear-resources -pear-skel -pear-misc -palamares -pear-qtmares - base cloud-init linux diff --git a/pear/pacman.conf b/crystal/pacman.conf similarity index 97% rename from pear/pacman.conf rename to crystal/pacman.conf index 98cd8a1..fd5ae1a 100644 --- a/pear/pacman.conf +++ b/crystal/pacman.conf @@ -75,9 +75,9 @@ RemoteFileSigLevel = Never #[testing] #Include = /etc/pacman.d/mirrorlist -[pear] -Server = https://repo.xhec.us/pear -SigLevel = Never +#[pear] +#Server = https://repo.xhec.us/pear +#SigLevel = Never [core] Include = /etc/pacman.d/mirrorlist diff --git a/pear/profiledef.sh b/crystal/profiledef.sh similarity index 71% rename from pear/profiledef.sh rename to crystal/profiledef.sh index 5af9585..1ddbe49 100644 --- a/pear/profiledef.sh +++ b/crystal/profiledef.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="pearos-live" -iso_label="PEAR_$(date +%Y%m)" -iso_publisher="PearOS Linux " -iso_application="PearOS Live" +iso_name="crystal-live" +iso_label="CRYS_$(date +%Y%m)" +iso_publisher="CrystalUX