simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-05-02 21:45:13 +02:00
parent 080bee6996
commit 4c5c5ffe92
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make_mksquashfs-auto.sh
View file

@ -53,8 +53,10 @@ function minimalinstallation() {
pacman-key --init pacman-key --init
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
pacman -U --noconfirm --force https://www.parabola.nu/packages/libre/any/parabola-keyring/download
./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt) ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
elif [ "${version}" == "manjaro" ]; then elif [ "${version}" == "manjaro" ]; then
pacman -U --noconfirm --force https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20171027-2-any.pkg.tar.xz
./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_manjaro.txt) ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_manjaro.txt)
else else
./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) ./pacstrap -C pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)

33
pacman.conf_manjaro
View file

@ -11,15 +11,15 @@
# If you wish to use different paths, uncomment and update the paths. # If you wish to use different paths, uncomment and update the paths.
#RootDir = / #RootDir = /
#DBPath = /var/lib/pacman/ #DBPath = /var/lib/pacman/
CacheDir = /var/cache/pacman/pkg/ #CacheDir = /var/cache/pacman/pkg/
#LogFile = /var/log/pacman.log #LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/ #GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/ #HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc manjaro-system HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first #XferCommand = /usr/bin/curl -4 -v -C - -f %u > %o
#SyncFirst = manjaro-system archlinux-keyring manjaro-keyring #XferCommand = /usr/bin/wget -4 --passive-ftp -c -t 0 -O %o %u
#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/snarf -N %u
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/aria2c --allow-overwrite=true --continue=true --file-allocation=none --log-level=error --max-tries=2 --max-connection-per-server=2 --max-file-not-found=5 --min-split-size=5M --no-conf --remote-time=true --summary-interval=60 --timeout=5 --dir=/ --out %o %u
#CleanMethod = KeepInstalled #CleanMethod = KeepInstalled
#UseDelta = 0.7 #UseDelta = 0.7
Architecture = auto Architecture = auto
@ -33,9 +33,8 @@ Architecture = auto
# Misc options # Misc options
#UseSyslog #UseSyslog
#Color Color
#TotalDownload #TotalDownload
# We cannot check disk space from within a chroot environment
CheckSpace CheckSpace
#VerbosePkgLists #VerbosePkgLists
@ -46,8 +45,8 @@ LocalFileSigLevel = Optional
RemoteFileSigLevel = Never RemoteFileSigLevel = Never
# NOTE: You must run `pacman-key --init` before first using pacman; the local # NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Manjaro Linux # keyring can then be populated with the keys of all official Arch Linux
# packagers with `pacman-key --populate archlinux manjaro`. # packagers with `pacman-key --populate archlinux`.
# #
# REPOSITORIES # REPOSITORIES
@ -72,23 +71,28 @@ RemoteFileSigLevel = Never
# repo name header and Include lines. You can add preferred servers immediately # repo name header and Include lines. You can add preferred servers immediately
# after the header, and they will be used before the default mirrors. # after the header, and they will be used before the default mirrors.
#[testing]
#Include = /etc/pacman.d/mirrorlist
[core] [core]
SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist_manjaro Include = /etc/pacman.d/mirrorlist_manjaro
[extra] [extra]
SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist_manjaro Include = /etc/pacman.d/mirrorlist_manjaro
#[community-testing]
#Include = /etc/pacman.d/mirrorlist
[community] [community]
SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist_manjaro Include = /etc/pacman.d/mirrorlist_manjaro
# If you want to run 32 bit applications on your x86_64 system, # If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here. # enable the multilib repositories as required here.
#[multilib-testing]
#Include = /etc/pacman.d/mirrorlist
[multilib] [multilib]
SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist_manjaro Include = /etc/pacman.d/mirrorlist_manjaro
# An example of a custom package repository. See the pacman manpage for # An example of a custom package repository. See the pacman manpage for
@ -96,4 +100,3 @@ Include = /etc/pacman.d/mirrorlist_manjaro
#[custom] #[custom]
#SigLevel = Optional TrustAll #SigLevel = Optional TrustAll
#Server = file:///home/custompkgs #Server = file:///home/custompkgs