diff --git a/.gitignore b/.gitignore index f59e92e..e4e183a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.iso sysroot/ sysroot.* -crystal/pacman.conf \ No newline at end of file +crystal/pacman.conf +crystal/airootfs/pacman.conf \ No newline at end of file diff --git a/build_iso.sh b/build_iso.sh index aefdfba..f776d7b 100755 --- a/build_iso.sh +++ b/build_iso.sh @@ -22,4 +22,5 @@ cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64 cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/. echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp time sudo ./mkarchiso -v -w $WORKDIR -o . crystal -sudo rm -rf $WORKDIR \ No newline at end of file +sudo rm -rf $WORKDIR +sudo chown $USER:$USER *.iso \ No newline at end of file diff --git a/crystal/airootfs/etc/buildstamp b/crystal/airootfs/etc/buildstamp index 7b390e6..1b3dc96 100644 --- a/crystal/airootfs/etc/buildstamp +++ b/crystal/airootfs/etc/buildstamp @@ -1 +1 @@ -Built on 05/24/21 @ 18:06:44 EST +Built on 05/24/21 @ 18:38:07 EST diff --git a/crystal/airootfs/etc/pacman.conf b/crystal/airootfs/etc/pacman.conf deleted file mode 100644 index f4cf8d3..0000000 --- a/crystal/airootfs/etc/pacman.conf +++ /dev/null @@ -1,113 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -TotalDownload -ILoveCandy -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Never -LocalFileSigLevel = Never -RemoteFileSigLevel = Never - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[crystal] -Server = https://github.com/crystalux-project/packages/raw/main/crystal/ -SigLevel = Never - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# Apparently this is a depend?? -# (ckbcomp to be exact) -[aur] -Server = https://repo.xhec.us/aur -SigLevel = Never - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs