fix
This commit is contained in:
parent
1964e68635
commit
b517a86dbe
4 changed files with 23 additions and 25 deletions
|
@ -713,7 +713,7 @@ pacman -Syu --needed --noconfirm
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
mkinitcpio -p linux-libre
|
mkinitcpio -p linux-libre
|
||||||
else
|
else
|
||||||
mkinitcpio -p linux -c /etc/mkinitcpio.conf
|
mkinitcpio -P -c /etc/mkinitcpio.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Fertig!!!"
|
echo "Fertig!!!"
|
||||||
|
|
|
@ -1060,7 +1060,7 @@ then
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
|
arch-chroot ${mountpoint} mkinitcpio -p linux-libre
|
||||||
else
|
else
|
||||||
arch-chroot ${mountpoint} mkinitcpio -p linux -c /etc/mkinitcpio.conf
|
arch-chroot ${mountpoint} mkinitcpio -P -c /etc/mkinitcpio.conf
|
||||||
#arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
|
#arch-chroot ${mountpoint} mkinitcpio -p linux-lts -c /etc/mkinitcpio-lts.conf
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
@ -43,13 +43,8 @@ fish
|
||||||
freeciv
|
freeciv
|
||||||
gdisk
|
gdisk
|
||||||
git
|
git
|
||||||
gnome
|
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-extra
|
|
||||||
gnome-flashback
|
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
gnome-power-manager
|
|
||||||
gnome-screensaver
|
|
||||||
gnuchess
|
gnuchess
|
||||||
gnupg
|
gnupg
|
||||||
gparted
|
gparted
|
||||||
|
@ -141,6 +136,12 @@ wpa_supplicant
|
||||||
x11vnc
|
x11vnc
|
||||||
xdg-utils
|
xdg-utils
|
||||||
xf86-input-synaptics
|
xf86-input-synaptics
|
||||||
|
xfce4
|
||||||
|
xfce4-goodies
|
||||||
|
xfce4-power-manager
|
||||||
|
xfce4-pulseaudio-plugin
|
||||||
|
xfce4-sensors-plugin
|
||||||
|
xfce4-xkb-plugin
|
||||||
xorg
|
xorg
|
||||||
xorg-drivers
|
xorg-drivers
|
||||||
xorg-server
|
xorg-server
|
||||||
|
|
|
@ -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
|
HoldPkg = pacman glibc manjaro-system
|
||||||
#XferCommand = /usr/bin/curl -4 -v -C - -f %u > %o
|
# If upgrades are available for these packages they will be asked for first
|
||||||
#XferCommand = /usr/bin/wget -4 --passive-ftp -c -t 0 -O %o %u
|
SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||||
#XferCommand = /usr/bin/snarf -N %u
|
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||||
#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
|
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||||
#CleanMethod = KeepInstalled
|
#CleanMethod = KeepInstalled
|
||||||
#UseDelta = 0.7
|
#UseDelta = 0.7
|
||||||
Architecture = auto
|
Architecture = auto
|
||||||
|
@ -33,8 +33,9 @@ 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
|
||||||
|
|
||||||
|
@ -45,8 +46,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 Arch Linux
|
# keyring can then be populated with the keys of all official Manjaro Linux
|
||||||
# packagers with `pacman-key --populate archlinux`.
|
# packagers with `pacman-key --populate archlinux manjaro`.
|
||||||
|
|
||||||
#
|
#
|
||||||
# REPOSITORIES
|
# REPOSITORIES
|
||||||
|
@ -71,28 +72,23 @@ 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
|
||||||
|
@ -100,3 +96,4 @@ Include = /etc/pacman.d/mirrorlist_manjaro
|
||||||
#[custom]
|
#[custom]
|
||||||
#SigLevel = Optional TrustAll
|
#SigLevel = Optional TrustAll
|
||||||
#Server = file:///home/custompkgs
|
#Server = file:///home/custompkgs
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue