removed pacman.conf files and did some code cleanup
This commit is contained in:
Dan Johansen
parent
da9a01deac
commit
0ed6ab00fe
|
|
@ -67,23 +67,6 @@ create_install() {
|
|||
|
||||
msg "Creating install for $DEVICE..."
|
||||
|
||||
# backup host mirrorlist
|
||||
#sudo mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist-orig
|
||||
|
||||
# Create arm mirrlorlist
|
||||
#echo "Server = http://mirrors.dotsrc.org/manjaro-arm/stable/\$arch/\$repo/" > mirrorlist
|
||||
#sudo mv mirrorlist /etc/pacman.d/mirrorlist
|
||||
|
||||
# create chroot on SD card
|
||||
# sudo pacstrap -G -c -C $LIBDIR/pacman.conf.$ARCH $TMPDIR/root base manjaro-arm-keyring
|
||||
|
||||
# Enable cross architecture Chrooting
|
||||
#if [[ "$DEVICE" = "oc1" ]] || [[ "$DEVICE" = "rpi2" ]] || [[ "$DEVICE" = "xu4" ]]; then
|
||||
# sudo cp /usr/bin/qemu-arm-static $TMPDIR/root/usr/bin/
|
||||
#else
|
||||
# sudo cp /usr/bin/qemu-aarch64-static $TMPDIR/root/usr/bin/
|
||||
#fi
|
||||
|
||||
# fetch and extract rootfs
|
||||
msg "Downloading latest $ARCH rootfs..."
|
||||
cd $TMPDIR
|
||||
|
|
@ -100,10 +83,6 @@ create_install() {
|
|||
# Install device and editions specific packages
|
||||
sudo systemd-nspawn -D $TMPDIR/root pacman -S base $PKG_DEVICE $PKG_EDITION lsb-release --needed --noconfirm
|
||||
|
||||
# restore original mirrorlist to host system
|
||||
#sudo mv /etc/pacman.d/mirrorlist-orig /etc/pacman.d/mirrorlist
|
||||
#sudo pacman -Syy
|
||||
|
||||
msg "Enabling services..."
|
||||
# Enable services
|
||||
sudo systemd-nspawn -D $TMPDIR/root systemctl enable systemd-networkd.service getty.target haveged.service dhcpcd.service 1> /dev/null 2>&1
|
||||
|
|
@ -297,23 +276,8 @@ cleanup () {
|
|||
fi
|
||||
}
|
||||
|
||||
# Asking for user input!
|
||||
#read -p 'What device is this for? [Options: rpi3, oc2 and pinebook] ' DEVICE
|
||||
#read -p 'What edition do you want? [Options: minimal, lxqt and kde] ' EDITION
|
||||
#read -p 'What is the path to the SD card? (example: /dev/sdb)? ' SDCARD
|
||||
#read -p 'What username do you want? ' USER
|
||||
#read -sp "What password should $USER have? " PASSWORD
|
||||
#read -sp "
|
||||
#What password should the root user have? " ROOTPASSWORD
|
||||
#echo "
|
||||
#" #to fix next line from being in the password line
|
||||
#echo "Device = $DEVICE"
|
||||
#echo "Edition = $EDITION"
|
||||
#echo "Path to SD Card = $SDCARD"
|
||||
#echo "Username = $USER"
|
||||
|
||||
|
||||
# Using ncurses to ask for user input for variables
|
||||
# Using Dialog to ask for user input for variables
|
||||
DEVICE=$(dialog --clear --title "Manjaro ARM Installer" \
|
||||
--menu "Choose a device:" 20 51 6 \
|
||||
"rpi3" "Raspberry Pi 3" \
|
||||
|
|
@ -426,15 +390,6 @@ PKG_DEVICE=$(grep "^[^#;]" $PROFILES/arm-profiles/devices/$DEVICE | awk '{print
|
|||
PKG_EDITION=$(grep "^[^#;]" $PROFILES/arm-profiles/editions/$EDITION | awk '{print $1}')
|
||||
SRV_EDITION=$(grep "^[^#;]" $PROFILES/arm-profiles/services/$EDITION | awk '{print $1}')
|
||||
|
||||
# Remove '/dev/' from the name
|
||||
#DEV_NAME=`echo "$SDCARD" | cut -d "/" -f 3`
|
||||
|
||||
# Get size of SDCard (final sector)
|
||||
#SECTOR_SIZE=`cat /sys/block/${DEV_NAME}/size`
|
||||
|
||||
# Set the ending sector that the partition should be resized too
|
||||
#END_SECTOR=`expr $SECTOR_SIZE - 1`
|
||||
|
||||
|
||||
# Commands
|
||||
timer_start=$(get_timer)
|
||||
|
|
|
|||
|
|
@ -1,85 +0,0 @@
|
|||
#
|
||||
# /etc/pacman.conf
|
||||
#
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
|
||||
#
|
||||
# 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/lib/manjaro-arm-installer/tmp/pkg-cache/
|
||||
#LogFile = /var/log/pacman.log
|
||||
#GPGDir = /etc/pacman.d/gnupg/
|
||||
HoldPkg = pacman glibc manjaro-system
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system manjaro-arm-keyring archlinuxarm-keyring
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
#UseDelta = 0.7
|
||||
Architecture = aarch64
|
||||
|
||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||
#IgnorePkg =
|
||||
#IgnoreGroup =
|
||||
|
||||
#NoUpgrade =
|
||||
#NoExtract =
|
||||
|
||||
# Misc options
|
||||
#UseSyslog
|
||||
#Color
|
||||
#TotalDownload
|
||||
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 = Optional
|
||||
#RemoteFileSigLevel = Required
|
||||
|
||||
# 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-Arm
|
||||
# packagers with `pacman-key --populate archlinux manjaro-arm`.
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
[core]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
[extra]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
[community]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
# 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
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
#
|
||||
# /etc/pacman.conf
|
||||
#
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
|
||||
#
|
||||
# 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/lib/manjaro-arm-installer/tmp/pkg-cache/
|
||||
#LogFile = /var/log/pacman.log
|
||||
#GPGDir = /etc/pacman.d/gnupg/
|
||||
HoldPkg = pacman glibc manjaro-system
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system manjaro-arm-keyring archlinuxarm-keyring
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
#UseDelta = 0.7
|
||||
Architecture = armv7h
|
||||
|
||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||
#IgnorePkg =
|
||||
#IgnoreGroup =
|
||||
|
||||
#NoUpgrade =
|
||||
#NoExtract =
|
||||
|
||||
# Misc options
|
||||
#UseSyslog
|
||||
#Color
|
||||
#TotalDownload
|
||||
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 = Optional
|
||||
#RemoteFileSigLevel = Required
|
||||
|
||||
# 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-Arm
|
||||
# packagers with `pacman-key --populate archlinux manjaro-arm`.
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
|
||||
[core]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
[extra]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
[community]
|
||||
#Include = /etc/pacman.d/mirrorlist
|
||||
Server = http://mirrors.dotsrc.org/manjaro-arm/stable/$arch/$repo
|
||||
|
||||
# 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
|
||||
Loading…
Reference in New Issue